moneypools-thinking-sphinx 1.2.11 → 1.2.12

data/features/support/post_database.rb

@@ -0,0 +1,43 @@
+$:.unshift File.dirname(__FILE__) + '/../../lib'
+
+require 'lib/thinking_sphinx'
+
+%w( tmp/config tmp/log tmp/db/sphinx/development ).each do |path|
+  FileUtils.mkdir_p "#{Dir.pwd}/#{path}"
+end
+
+Kernel.const_set :RAILS_ROOT, "#{Dir.pwd}/tmp" unless defined?(RAILS_ROOT)
+
+at_exit do
+  ThinkingSphinx::Configuration.instance.controller.stop
+  sleep(1) # Ensure Sphinx has shut down completely
+  ActiveRecord::Base.logger.close
+  FileUtils.rm_r "#{Dir.pwd}/tmp"
+end
+
+# Add log file
+ActiveRecord::Base.logger = Logger.new open("tmp/active_record.log", "a")
+
+# Set up database tables
+Dir["features/support/db/migrations/*.rb"].each do |file|
+  require file.gsub(/\.rb$/, '')
+end
+
+# Load Models
+Dir["features/support/models/*.rb"].sort.each do |file|
+  require file.gsub(/\.rb$/, '')
+end
+
+ThinkingSphinx.deltas_enabled = false
+
+# Load Fixtures
+Dir["features/support/db/fixtures/*.rb"].each do |file|
+  require file.gsub(/\.rb$/, '')
+end
+
+ThinkingSphinx.deltas_enabled = true
+ThinkingSphinx.suppress_delta_output = true
+
+ThinkingSphinx::Configuration.instance.build
+ThinkingSphinx::Configuration.instance.controller.index
+ThinkingSphinx::Configuration.instance.controller.start

data/features/support/z.rb

@@ -0,0 +1,19 @@
+# This file exists because Cucumber likes to auto-load all ruby files
+puts <<-MESSAGE
+Cucumber 0.1.13 defaults to loading all ruby files within the features folder,
+with something approaching reverse-alphabetical order, and preferring the
+features/support folder over everything else. This is annoying, because some
+files need to be loaded before others (and others perhaps not at all, given
+missing dependencies). Hence this place-holder imaginatively named 'z.rb', to
+force this message.
+
+A work-around is to use cucumber profiles. You will find the default profile in
+cucumber.yml should serve your needs fine, unless you add new step definitions.
+When you do that, you can regenerate the YAML file by running:
+rake cucumber_defaults
+
+And then run specific features as follows is slightly more verbose, but it
+works, whereas this doesn't.
+cucumber -p default features/something.feature
+MESSAGE
+exit 0

data/lib/thinking_sphinx.rb

@@ -6,6 +6,7 @@ require 'active_record'
 require 'riddle'
 require 'after_commit'
 require 'yaml'
+require 'cgi'
 
 require 'thinking_sphinx/core/array'
 require 'thinking_sphinx/core/string'

data/lib/thinking_sphinx/active_record.rb

@@ -276,8 +276,7 @@ module ThinkingSphinx
         "#{self.class.sphinx_indexes.first.name}_delta",
         ['sphinx_deleted'],
         {self.sphinx_document_id => 1}
-      ) if ThinkingSphinx.deltas_enabled? &&
-        self.class.sphinx_indexes.any? { |index| index.delta? } &&
+      ) if self.class.sphinx_indexes.any? { |index| index.delta? } &&
         self.toggled_delta?
     rescue ::ThinkingSphinx::ConnectionError
       # nothing

data/lib/thinking_sphinx/attribute.rb

@@ -100,6 +100,9 @@ module ThinkingSphinx
           adapter.convert_nulls(part)
         when :datetime
           adapter.cast_to_datetime(part)
+        when :multi
+          part = adapter.cast_to_datetime(part) if is_many_datetimes?
+          adapter.convert_nulls(part, 0)
         else
           part
         end
@@ -151,8 +154,6 @@ module ThinkingSphinx
     def type
       @type ||= begin
         base_type = case
-        when is_many_datetimes?
-          :datetime
         when is_many?, is_many_ints?
           :multi
         when @associations.values.flatten.length > 1

data/lib/thinking_sphinx/configuration.rb

@@ -158,8 +158,8 @@ module ThinkingSphinx
     # 
     def load_models
       return if defined?(Rails) &&
-        Rails.configuration.cache_classes &&
-        Rails::VERSION::STRING.to_f > 2.1
+        Rails::VERSION::STRING.to_f > 2.1 &&
+        Rails.configuration.cache_classes
       
       self.model_directories.each do |base|
         Dir["#{base}**/*.rb"].each do |file|

data/lib/thinking_sphinx/deploy/capistrano.rb

@@ -45,7 +45,7 @@ DESC
     
       desc "Install Thinking Sphinx as a gem from GitHub"
       task :ts do
-        run "#{try_sudo} gem install freelancing-god-thinking-sphinx --source http://gems.github.com"
+        run "#{try_sudo} gem install thinking-sphinx --source http://gemcutter.org"
       end
     end
   

data/lib/thinking_sphinx/excerpter.rb

@@ -14,7 +14,7 @@ module ThinkingSphinx
     end
     
     def method_missing(method, *args, &block)
-      string = @instance.send(method, *args, &block).to_s
+      string = CGI::escapeHTML @instance.send(method, *args, &block).to_s
       
       @search.excerpt_for(string, @instance.class)
     end

data/lib/thinking_sphinx/search.rb

@@ -192,6 +192,7 @@ module ThinkingSphinx
           match[:attributes]["@count"]
       end
     end
+    alias_method :each_with_group_and_count, :each_with_groupby_and_count
     
     def each_with_weighting(&block)
       populate
@@ -244,6 +245,7 @@ module ThinkingSphinx
         else
           replace instances_from_matches
           add_excerpter
+          add_sphinx_attributes
         end
       end
     end
@@ -261,6 +263,23 @@ module ThinkingSphinx
       end
     end
     
+    def add_sphinx_attributes
+      each do |object|
+        next if object.nil? || object.respond_to?(:sphinx_attributes)
+        
+        match = @results[:matches].detect { |match|
+          match[:attributes]['sphinx_internal_id'] == object.
+            primary_key_for_sphinx &&
+          match[:attributes]['class_crc'] == object.class.to_crc32
+        }
+        next if match.nil?
+        
+        object.metaclass.instance_eval do
+          define_method(:sphinx_attributes) { match[:attributes] }
+        end
+      end
+    end
+    
     def self.log(message, method = :debug)
       return if ::ActiveRecord::Base.logger.nil?
       ::ActiveRecord::Base.logger.send method, message

data/lib/thinking_sphinx/source.rb

@@ -33,7 +33,7 @@ module ThinkingSphinx
     end
     
     def name
-      @model.name.underscore.tr(':/\\', '_')
+      @model.sphinx_name
     end
     
     def to_riddle_for_core(offset, index)

data/spec/lib/thinking_sphinx/active_record_spec.rb

@@ -268,17 +268,6 @@ describe ThinkingSphinx::ActiveRecord do
       @person.toggle_deleted
     end
     
-    it "should not update the delta index if delta indexing is disabled" do
-      ThinkingSphinx.deltas_enabled = false
-      Person.sphinx_indexes.each { |index| index.stub!(:delta? => true) }
-      @person.delta = true
-      @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
       ThinkingSphinx.updates_enabled = false
       ThinkingSphinx.deltas_enabled  = true

data/spec/lib/thinking_sphinx/attribute_spec.rb

@@ -22,7 +22,7 @@ describe ThinkingSphinx::Attribute do
     end
   end
   
-  describe "unique_name method" do
+  describe '#unique_name' do
     before :each do
       @attribute = ThinkingSphinx::Attribute.new @source, [
         stub('column', :__stack => [], :__name => "col_name")
@@ -47,7 +47,7 @@ describe ThinkingSphinx::Attribute do
     end
   end
   
-  describe "column_with_prefix method" do
+  describe '#column_with_prefix' do
     before :each do
       @attribute = ThinkingSphinx::Attribute.new @source, [
         ThinkingSphinx::Index::FauxColumn.new(:col_name)
@@ -101,7 +101,7 @@ describe ThinkingSphinx::Attribute do
     end
   end
   
-  describe "is_many? method" do
+  describe '#is_many?' do
     before :each do
       @assoc_a = stub('assoc', :is_many? => true)
       @assoc_b = stub('assoc', :is_many? => true)
@@ -135,7 +135,7 @@ describe ThinkingSphinx::Attribute do
     end
   end
   
-  describe "is_string? method" do
+  describe '#is_string?' do
     before :each do
       @col_a = ThinkingSphinx::Index::FauxColumn.new("a")
       @col_b = ThinkingSphinx::Index::FauxColumn.new("b")
@@ -163,7 +163,7 @@ describe ThinkingSphinx::Attribute do
     end
   end
   
-  describe "type method" do
+  describe '#type' do
     before :each do
       @column = ThinkingSphinx::Index::FauxColumn.new(:col_name)
       @attribute = ThinkingSphinx::Attribute.new(@source, [@column])
@@ -193,9 +193,16 @@ describe ThinkingSphinx::Attribute do
       @column.send(:instance_variable_set, :@name, "id")
       @attribute.send(:type).should == :integer
     end
+    
+    it "should return :multi if the columns return multiple datetimes" do
+      @attribute.stub!(:is_many? => true)
+      @attribute.stub!(:all_datetimes? => true)
+      
+      @attribute.type.should == :multi
+    end
   end
   
-  describe "all_ints? method" do
+  describe '#all_ints?' do
     it "should return true if all columns are integers" do
       attribute = ThinkingSphinx::Attribute.new(@source,
         [ ThinkingSphinx::Index::FauxColumn.new(:id),
@@ -230,7 +237,7 @@ describe ThinkingSphinx::Attribute do
     end
   end
   
-  describe "all_datetimes? method" do
+  describe '#all_datetimes?' do
     it "should return true if all columns are datetimes" do
       attribute = ThinkingSphinx::Attribute.new(@source,
         [ ThinkingSphinx::Index::FauxColumn.new(:created_at),

data/spec/lib/thinking_sphinx/deltas/job_spec.rb

@@ -0,0 +1,32 @@
+require 'spec/spec_helper'
+
+describe ThinkingSphinx::Deltas::Job do
+  describe '.cancel_thinking_sphinx_jobs' do
+    before :each do
+      ThinkingSphinx::Deltas::Job.stub!(:delete_all => true)
+    end
+    
+    it "should not delete any rows if the delayed_jobs table does not exist" do
+      ThinkingSphinx::Deltas::Job.connection.stub!(:tables => [])
+      ThinkingSphinx::Deltas::Job.should_not_receive(:delete_all)
+      
+      ThinkingSphinx::Deltas::Job.cancel_thinking_sphinx_jobs
+    end
+    
+    it "should delete rows if the delayed_jobs table does exist" do
+      ThinkingSphinx::Deltas::Job.connection.stub!(:tables => ['delayed_jobs'])
+      ThinkingSphinx::Deltas::Job.should_receive(:delete_all)
+      
+      ThinkingSphinx::Deltas::Job.cancel_thinking_sphinx_jobs
+    end
+    
+    it "should delete only Thinking Sphinx jobs" do
+      ThinkingSphinx::Deltas::Job.connection.stub!(:tables => ['delayed_jobs'])
+      ThinkingSphinx::Deltas::Job.should_receive(:delete_all) do |sql|
+        sql.should match(/handler LIKE '--- !ruby\/object:ThinkingSphinx::Deltas::\%'/)
+      end
+      
+      ThinkingSphinx::Deltas::Job.cancel_thinking_sphinx_jobs
+    end
+  end
+end

data/spec/lib/thinking_sphinx/excerpter_spec.rb

@@ -40,6 +40,14 @@ describe ThinkingSphinx::Excerpter do
       @excerpter.big_name
     end
     
+    it "should escape the text in the excerpt" do
+      @search.should_receive(:excerpt_for) do |string, model|
+        string.should == 'test "escaping" <characters>'
+      end
+      
+      @excerpter.string_to_escape
+    end
+    
     it "should still raise an exception if no column or method exists" do
       lambda {
         @excerpter.foo

data/spec/lib/thinking_sphinx/search_spec.rb

@@ -732,28 +732,54 @@ describe ThinkingSphinx::Search do
       end
     end
     
-    describe 'excerpts' do
-      before :each do
-        @search = ThinkingSphinx::Search.new
-      end
+    context 'result objects' do
+      describe '#excerpts' do
+        before :each do
+          @search = ThinkingSphinx::Search.new
+        end
       
-      it "should add excerpts method if objects don't already have one" do
-        @search.first.should respond_to(:excerpts)
-      end
+        it "should add excerpts method if objects don't already have one" do
+          @search.first.should respond_to(:excerpts)
+        end
       
-      it "should return an instance of ThinkingSphinx::Excerpter" do
-        @search.first.excerpts.should be_a(ThinkingSphinx::Excerpter)
-      end
+        it "should return an instance of ThinkingSphinx::Excerpter" do
+          @search.first.excerpts.should be_a(ThinkingSphinx::Excerpter)
+        end
       
-      it "should not add excerpts method if objects already have one" do
-        @search.last.excerpts.should_not be_a(ThinkingSphinx::Excerpter)
-      end
+        it "should not add excerpts method if objects already have one" do
+          @search.last.excerpts.should_not be_a(ThinkingSphinx::Excerpter)
+        end
       
-      it "should set up the excerpter with the instances and search" do
-        ThinkingSphinx::Excerpter.should_receive(:new).with(@search, @alpha_a)
-        ThinkingSphinx::Excerpter.should_receive(:new).with(@search, @alpha_b)
+        it "should set up the excerpter with the instances and search" do
+          ThinkingSphinx::Excerpter.should_receive(:new).with(@search, @alpha_a)
+          ThinkingSphinx::Excerpter.should_receive(:new).with(@search, @alpha_b)
+        
+          @search.first
+        end
+      end
+    
+      describe '#sphinx_attributes' do
+        before :each do
+          @search = ThinkingSphinx::Search.new
+        end
         
-        @search.first
+        it "should add sphinx_attributes method if objects don't already have one" do
+          @search.last.should respond_to(:sphinx_attributes)
+        end
+        
+        it "should return a hash" do
+          @search.last.sphinx_attributes.should be_a(Hash)
+        end
+        
+        it "should not add sphinx_attributes if objects have a method of that name already" do
+          @search.first.sphinx_attributes.should_not be_a(Hash)
+        end
+        
+        it "should pair sphinx_attributes with the correct hash" do
+          hash = @search.last.sphinx_attributes
+          hash['sphinx_internal_id'].should == @search.last.id
+          hash['class_crc'].should == @search.last.class.to_crc32
+        end
       end
     end
   end
@@ -893,6 +919,15 @@ describe ThinkingSphinx::Search do
         count.should  == 5
       end
     end
+    
+    it "should be aliased to each_with_group_and_count" do
+      search = ThinkingSphinx::Search.new
+      search.each_with_group_and_count do |obj, group, count|
+        obj.should    == @alpha
+        group.should  == 101
+        count.should  == 5
+      end
+    end
   end
   
   describe '.each_with_weighting' do

data/tasks/distribution.rb

@@ -7,11 +7,12 @@ YARD::Rake::YardocTask.new do |t|
 end
 
 Jeweler::Tasks.new do |gem|
-  gem.name      = "moneypools-thinking-sphinx"
-  gem.summary   = "A concise and easy-to-use Ruby library that connects ActiveRecord to the Sphinx search daemon, managing configuration, indexing and searching."
-  gem.author    = "Pat Allan"
-  gem.email     = "pat@freelancing-gods.com"
-  gem.homepage  = "http://ts.freelancing-gods.com"
+  gem.name        = "moneypools-thinking-sphinx"
+  gem.summary     = "ActiveRecord/Rails Sphinx library"
+  gem.description = "A concise and easy-to-use Ruby library that connects ActiveRecord to the Sphinx search daemon, managing configuration, indexing and searching."
+  gem.author      = "Pat Allan"
+  gem.email       = "pat@freelancing-gods.com"
+  gem.homepage    = "http://ts.freelancing-gods.com"
     
   # s.rubyforge_project = "thinking-sphinx"
   gem.files     = FileList[
@@ -24,7 +25,10 @@ Jeweler::Tasks.new do |gem|
     "vendor/**/*",
     "VERSION.yml"
   ]
-  gem.test_files = FileList["spec/**/*_spec.rb"]
+  gem.test_files = FileList[
+    "features/**/*",
+    "spec/**/*_spec.rb"
+  ]
   
   gem.add_dependency 'activerecord', '>= 1.15.6'
   

data/vendor/riddle/lib/riddle.rb

@@ -18,7 +18,7 @@ module Riddle #:nodoc:
     Rev     = 1533
     # Release number to mark my own fixes, beyond feature parity with
     # Sphinx itself.
-    Release = 7
+    Release = 10
     
     String      = [Major, Minor, Tiny].join('.')
     GemVersion  = [Major, Minor, Tiny, Rev, Release].join('.')