thinking-sphinx 2.0.0 → 2.0.1

data/README.textile

@@ -189,3 +189,7 @@ Since I first released this library, there's been quite a few people who have su
 * Lee Capps
 * Sam Goldstein
 * Artem Orlov
+* Matt Todd
+* Ivan Ukhov
+* Stephen Celis
+* Paco Guzmán

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.0.1

data/features/step_definitions/search_steps.rb

@@ -11,24 +11,24 @@ When /^I search for the document id of (\w+) (\w+) in the (\w+) index$/ do |mode
 end
 
 Then "it should exist" do
-  ThinkingSphinx::Search.search_for_id(@id, @index).should == true
+  ThinkingSphinx.search_for_id(@id, @index).should == true
 end
 
 Then "it should not exist" do
-  ThinkingSphinx::Search.search_for_id(@id, @index).should == false
+  ThinkingSphinx.search_for_id(@id, @index).should == false
 end
 
 Then "it should exist if using Rails 2.1 or newer" do
   require 'active_record/version'
   unless ActiveRecord::VERSION::STRING.to_f < 2.1
-    ThinkingSphinx::Search.search_for_id(@id, @index).should == true
+    ThinkingSphinx.search_for_id(@id, @index).should == true
   end
 end
 
 Then "it should not exist if using Rails 2.1 or newer" do
   require 'active_record/version'
   unless ActiveRecord::VERSION::STRING.to_f < 2.1
-    ThinkingSphinx::Search.search_for_id(@id, @index).should == false
+    ThinkingSphinx.search_for_id(@id, @index).should == false
   end
 end
 

data/lib/cucumber/thinking_sphinx/internal_world.rb

@@ -68,7 +68,7 @@ module Cucumber
         Kernel.at_exit do
           ::ThinkingSphinx::Configuration.instance.controller.stop
           sleep(0.5) # Ensure Sphinx has shut down completely
-          ActiveRecord::Base.logger.close
+          ::ThinkingSphinx::ActiveRecord::LogSubscriber.logger.close
         end
       end
       
@@ -89,7 +89,7 @@ module Cucumber
       end
       
       def configure_active_record
-        ActiveRecord::Base.logger = Logger.new(
+        ::ThinkingSphinx::ActiveRecord::LogSubscriber.logger = Logger.new(
           open("#{temporary_directory}/active_record.log", "a")
         )
         

data/lib/thinking-sphinx.rb

@@ -0,0 +1 @@
+require 'thinking_sphinx'

data/lib/thinking_sphinx/action_controller.rb

@@ -0,0 +1,31 @@
+module ThinkingSphinx
+  module ActionController
+    extend ActiveSupport::Concern
+
+    protected
+
+    attr_internal :query_runtime
+
+    def cleanup_view_runtime
+      log_subscriber = ThinkingSphinx::ActiveRecord::LogSubscriber
+      query_runtime_pre_render = log_subscriber.reset_runtime
+      runtime = super
+      query_runtime_post_render = log_subscriber.reset_runtime
+      self.query_runtime = query_runtime_pre_render + query_runtime_post_render
+      runtime - query_runtime_post_render
+    end
+
+    def append_info_to_payload(payload)
+      super
+      payload[:query_runtime] = query_runtime
+    end
+
+    module ClassMethods
+      def log_process_action(payload)
+        messages, query_runtime = super, payload[:query_runtime]
+        messages << ("Sphinx: %.1fms" % query_runtime.to_f) if query_runtime
+        messages
+      end
+    end
+  end
+end

data/lib/thinking_sphinx/active_record.rb

@@ -1,6 +1,7 @@
 require 'thinking_sphinx/active_record/attribute_updates'
 require 'thinking_sphinx/active_record/delta'
 require 'thinking_sphinx/active_record/has_many_association'
+require 'thinking_sphinx/active_record/log_subscriber'
 require 'thinking_sphinx/active_record/scopes'
 
 module ThinkingSphinx

data/lib/thinking_sphinx/active_record/log_subscriber.rb

@@ -0,0 +1,61 @@
+require 'active_support/log_subscriber'
+
+module ThinkingSphinx
+  module ActiveRecord
+    class LogSubscriber < ActiveSupport::LogSubscriber
+      def self.runtime=(value)
+        Thread.current['thinking_sphinx_query_runtime'] = value
+      end
+
+      def self.runtime
+        Thread.current['thinking_sphinx_query_runtime'] ||= 0
+      end
+
+      def self.reset_runtime
+        rt, self.runtime = runtime, 0
+        rt
+      end
+
+      def initialize
+        super
+        @odd_or_even = false
+      end
+
+      def query(event)
+        self.class.runtime += event.duration
+        return unless logger.debug?
+
+        identifier = color('Sphinx Query (%.1fms)' % event.duration, GREEN, true)
+        query = event.payload[:query]
+        query = color query, nil, true if odd?
+
+        debug "  #{identifier}  #{query}"
+      end
+
+      def message(event)
+        return unless logger.debug?
+
+        identifier = color 'Sphinx', GREEN, true
+        message = event.payload[:message]
+        message = color message, nil, true if odd?
+
+        debug "  #{identifier}  #{message}"
+      end
+
+      def odd?
+        @odd_or_even = !@odd_or_even
+      end
+
+      def logger
+        return @logger if defined? @logger
+        self.logger = ::ActiveRecord::Base.logger
+      end
+
+      def logger=(logger)
+        @logger = logger
+      end
+
+      attach_to :thinking_sphinx
+    end
+  end
+end

data/lib/thinking_sphinx/association.rb

@@ -64,12 +64,12 @@ module ThinkingSphinx
     end
     
     def arel_join
-      arel_join = @join.with_join_class(Arel::OuterJoin)
-      arel_join.options[:conditions].gsub!(/::ts_join_alias::/,
+      @join.join_type = Arel::OuterJoin
+      @join.options[:conditions].gsub!(/::ts_join_alias::/,
         "#{@reflection.klass.connection.quote_table_name(@join.parent.aliased_table_name)}"
-      ) if arel_join.options[:conditions].is_a?(String)
+      ) if @join.options[:conditions].is_a?(String)
       
-      arel_join
+      @join
     end
     
     # Returns true if the association - or a parent - is a has_many or

data/lib/thinking_sphinx/attribute.rb

@@ -224,7 +224,7 @@ module ThinkingSphinx
       end_assoc  = end_association_for_mva
       raise "Could not determine SQL for MVA" if base_assoc.nil?
       
-      relation = Table(base_assoc.table)
+      relation = Arel::Table.new(base_assoc.table)
       
       association_joins.each do |join|
         relation = relation.join(join.relation, Arel::OuterJoin).

data/lib/thinking_sphinx/railtie.rb

@@ -10,6 +10,13 @@ module ThinkingSphinx
       end
     end
 
+    initializer "thinking_sphinx.action_controller" do
+      ActiveSupport.on_load :action_controller do
+        require 'thinking_sphinx/action_controller'
+        include ThinkingSphinx::ActionController
+      end
+    end
+
     initializer "thinking_sphinx.set_app_root" do |app|
       ThinkingSphinx::Configuration.instance.reset # Rails has setup app now
     end

data/lib/thinking_sphinx/search.rb

@@ -29,34 +29,38 @@ module ThinkingSphinx
     
     # Deprecated. Use ThinkingSphinx.search
     def self.search(*args)
-      log 'ThinkingSphinx::Search.search is deprecated. Please use ThinkingSphinx.search instead.'
+      warn 'ThinkingSphinx::Search.search is deprecated. Please use ThinkingSphinx.search instead.'
       ThinkingSphinx.search *args
     end
     
     # Deprecated. Use ThinkingSphinx.search_for_ids
     def self.search_for_ids(*args)
-      log 'ThinkingSphinx::Search.search_for_ids is deprecated. Please use ThinkingSphinx.search_for_ids instead.'
+      warn 'ThinkingSphinx::Search.search_for_ids is deprecated. Please use ThinkingSphinx.search_for_ids instead.'
       ThinkingSphinx.search_for_ids *args
     end
     
     # Deprecated. Use ThinkingSphinx.search_for_ids
     def self.search_for_id(*args)
-      log 'ThinkingSphinx::Search.search_for_id is deprecated. Please use ThinkingSphinx.search_for_id instead.'
+      warn 'ThinkingSphinx::Search.search_for_id is deprecated. Please use ThinkingSphinx.search_for_id instead.'
       ThinkingSphinx.search_for_id *args
     end
     
     # Deprecated. Use ThinkingSphinx.count
     def self.count(*args)
-      log 'ThinkingSphinx::Search.count is deprecated. Please use ThinkingSphinx.count instead.'
+      warn 'ThinkingSphinx::Search.count is deprecated. Please use ThinkingSphinx.count instead.'
       ThinkingSphinx.count *args
     end
     
     # Deprecated. Use ThinkingSphinx.facets
     def self.facets(*args)
-      log 'ThinkingSphinx::Search.facets is deprecated. Please use ThinkingSphinx.facets instead.'
+      warn 'ThinkingSphinx::Search.facets is deprecated. Please use ThinkingSphinx.facets instead.'
       ThinkingSphinx.facets *args
     end
-    
+
+    def self.warn(message)
+      ::ActiveSupport::Deprecation.warn message
+    end
+
     def self.bundle_searches(enum = nil)
       bundle = ThinkingSphinx::BundledSearch.new
       
@@ -102,6 +106,11 @@ module ThinkingSphinx
       self
     end
     
+    def as_json(*args)
+      populate
+      @array.as_json(*args)
+    end
+    
     # Indication of whether the request has been made to Sphinx for the search
     # query.
     # 
@@ -344,12 +353,11 @@ module ThinkingSphinx
       
       retry_on_stale_index do
         begin
-          log "Querying: '#{query}'"
-          runtime = Benchmark.realtime {
+          log query do
             @results = client.query query, indexes, comment
-          }
-          log "Found #{@results[:total_found]} results", :debug,
-            "Sphinx (#{sprintf("%f", runtime)}s)"
+          end
+          total = @results[:total_found].to_i
+          log "Found #{total} result#{'s' unless total == 1}"
         rescue Errno::ECONNREFUSED => err
           raise ThinkingSphinx::ConnectionError,
             'Connection to Sphinx Daemon (searchd) failed.'
@@ -406,30 +414,27 @@ module ThinkingSphinx
         match[:attributes]['class_crc'] == object.class.to_crc32
       }
     end
-    
-    def self.log(message, method = :debug, identifier = 'Sphinx')
-      return if ::ActiveRecord::Base.logger.nil?
-      
-      info = ''
-      if ::ActiveRecord::LogSubscriber.colorize_logging
-        identifier_color, message_color = "4;32;1", "0" # 0;1 = Bold
-        info << "  \e[#{identifier_color}m#{identifier}\e[0m   "
-        info << "\e[#{message_color}m#{message}\e[0m"
+
+    def self.log(message, &block)
+      return if ThinkingSphinx::ActiveRecord::LogSubscriber.logger.nil?
+
+      if block_given?
+        ::ActiveSupport::Notifications.
+          instrument('query.thinking_sphinx', :query => message, &block)
       else
-        info = "#{identifier}   #{message}"
+        ::ActiveSupport::Notifications.
+          instrument('message.thinking_sphinx', :message => message)
       end
-      
-      ::ActiveRecord::Base.logger.send method, info
     end
-    
-    def log(*args)
-      self.class.log(*args)
+
+    def log(query, &block)
+      self.class.log(query, &block)
     end
-    
+
     def prepare(client)
       index_options = one_class ?
         one_class.sphinx_indexes.first.local_options : {}
-      
+
       [
         :max_matches, :group_by, :group_function, :group_clause,
         :group_distinct, :id_range, :cut_off, :retry_count, :retry_delay,
@@ -475,8 +480,8 @@ module ThinkingSphinx
         stale_ids |= err.ids
         # ID exclusion
         options[:without_ids] = Array(options[:without_ids]) | err.ids
-        
-        log 'Sphinx Stale Ids (%s %s left): %s' % [
+
+        log 'Stale Ids (%s %s left): %s' % [
           retries, (retries == 1 ? 'try' : 'tries'), stale_ids.join(', ')
         ]
         retry
@@ -728,13 +733,37 @@ module ThinkingSphinx
       when NilClass
         nil
       when Array
-        includes.select { |inc| klass.reflections[inc] }
+        include_from_array includes, klass
       when Symbol
         klass.reflections[includes].nil? ? nil : includes
+      when Hash
+        include_from_hash includes, klass
       else
         includes
       end
     end
+
+    def include_from_array(array, klass)
+      scoped_array = []
+      array.each do |value|
+        case value
+        when Hash
+          scoped_hash = include_from_hash(value, klass)
+          scoped_array << scoped_hash unless scoped_hash.nil?
+        else
+          scoped_array << value unless klass.reflections[value].nil?
+        end
+      end
+      scoped_array.empty? ? nil : scoped_array
+    end
+    
+    def include_from_hash(hash, klass)
+      scoped_hash = {}
+      hash.keys.each do |key|
+        scoped_hash[key] = hash[key] unless klass.reflections[key].nil?
+      end
+      scoped_hash.empty? ? nil : scoped_hash
+    end
     
     def instances_from_class(klass, matches)
       index_options = klass.sphinx_index_options

data/spec/thinking_sphinx/search_spec.rb

@@ -115,8 +115,10 @@ describe ThinkingSphinx::Search do
     it "return the output of ThinkingSphinx.search" do
       @results = [] # to confirm same object
       ThinkingSphinx.stub!(:search => @results)
-      
-      ThinkingSphinx::Search.search.object_id.should == @results.object_id
+
+      ActiveSupport::Deprecation.silence do
+        ThinkingSphinx::Search.search.object_id.should == @results.object_id
+      end
     end
   end
   
@@ -124,9 +126,11 @@ describe ThinkingSphinx::Search do
     it "return the output of ThinkingSphinx.search_for_ids" do
       @results = [] # to confirm same object
       ThinkingSphinx.stub!(:search_for_ids => @results)
-      
-      ThinkingSphinx::Search.search_for_ids.object_id.
-        should == @results.object_id
+
+      ActiveSupport::Deprecation.silence do
+        ThinkingSphinx::Search.search_for_ids.object_id.
+          should == @results.object_id
+      end
     end
   end
   
@@ -134,9 +138,11 @@ describe ThinkingSphinx::Search do
     it "return the output of ThinkingSphinx.search_for_ids" do
       @results = [] # to confirm same object
       ThinkingSphinx.stub!(:search_for_id => @results)
-      
-      ThinkingSphinx::Search.search_for_id.object_id.
-        should == @results.object_id
+
+      ActiveSupport::Deprecation.silence do
+        ThinkingSphinx::Search.search_for_id.object_id.
+          should == @results.object_id
+      end
     end
   end
   
@@ -144,8 +150,10 @@ describe ThinkingSphinx::Search do
     it "return the output of ThinkingSphinx.search" do
       @results = [] # to confirm same object
       ThinkingSphinx.stub!(:count => @results)
-      
-      ThinkingSphinx::Search.count.object_id.should == @results.object_id
+
+      ActiveSupport::Deprecation.silence do
+        ThinkingSphinx::Search.count.object_id.should == @results.object_id
+      end
     end
   end
   
@@ -153,8 +161,10 @@ describe ThinkingSphinx::Search do
     it "return the output of ThinkingSphinx.facets" do
       @results = [] # to confirm same object
       ThinkingSphinx.stub!(:facets => @results)
-      
-      ThinkingSphinx::Search.facets.object_id.should == @results.object_id
+
+      ActiveSupport::Deprecation.silence do
+        ThinkingSphinx::Search.facets.object_id.should == @results.object_id
+      end
     end
   end
   
@@ -245,6 +255,46 @@ describe ThinkingSphinx::Search do
       
       ThinkingSphinx::Search.new(:include => :betas).first
     end
+
+    it "should respect complex includes" do
+      Alpha.should_receive(:find) do |type, options|
+        options[:include].should == [:thetas, {:betas => :gammas}]
+        [@alpha_a, @alpha_b]
+      end
+
+      Beta.should_receive(:find) do |type, options|
+        options[:include].should be_nil
+        [@beta_a, @beta_b]
+      end
+
+      ThinkingSphinx::Search.new(:include => [:thetas, {:betas => :gammas}]).first
+    end
+    
+    it "should respect hash includes" do
+      Alpha.should_receive(:find) do |type, options|
+        options[:include].should == {:betas => :gammas}
+        [@alpha_a, @alpha_b]
+      end
+      
+      Beta.should_receive(:find) do |type, options|
+        options[:include].should be_nil
+        [@beta_a, @beta_b]
+      end
+      
+      ThinkingSphinx::Search.new(:include => {:betas => :gammas}).first
+    end
+    
+    it "should respect includes for single class searches" do
+      Alpha.should_receive(:find) do |type, options|
+        options[:include].should == {:betas => :gammas}
+        [@alpha_a, @alpha_b]
+      end
+      
+      ThinkingSphinx::Search.new(
+        :include => {:betas => :gammas},
+        :classes => [Alpha]
+      ).first
+    end
     
     describe 'query' do
       it "should concatenate arguments with spaces" do

data/tasks/testing.rb

@@ -6,7 +6,6 @@ desc "Run the specs under spec"
 RSpec::Core::RakeTask.new do |t|
   t.pattern = 'spec/**/*_spec.rb'
 end
-task :spec => :check_dependencies
 
 desc "Run all feature-set configurations"
 task :features do |t|
@@ -26,9 +25,6 @@ namespace :features do
   
   add_task :mysql,      "Run feature-set against MySQL"
   add_task :postgresql, "Run feature-set against PostgreSQL"
-  
-  task :mysql      => :check_dependencies
-  task :postgresql => :check_dependencies
 end
 
 namespace :rcov do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: thinking-sphinx
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 2
   - 0
-  - 0
-  version: 2.0.0
+  - 1
+  version: 2.0.1
 platform: ruby
 authors: 
 - Pat Allan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-15 00:00:00 +08:00
+date: 2010-11-20 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 1
         segments: 
         - 3
         - 0
-        - 0
-        version: 3.0.0
+        - 3
+        version: 3.0.3
   requirement: *id001
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -43,12 +43,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 29
         segments: 
         - 1
         - 2
-        - 0
-        version: 1.2.0
+        - 1
+        version: 1.2.1
   requirement: *id002
 - !ruby/object:Gem::Dependency 
   type: :development
@@ -85,25 +85,40 @@ dependencies:
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
-  name: jeweler
+  name: actionpack
   version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 3
+        - 0
+        - 3
+        version: 3.0.3
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: jeweler
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -1876988220
+        hash: 1
         segments: 
         - 1
         - 5
-        - 0
-        - pre5
-        version: 1.5.0.pre5
-  requirement: *id005
+        - 1
+        version: 1.5.1
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: yard
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -114,12 +129,12 @@ dependencies:
         - 6
         - 1
         version: 0.6.1
-  requirement: *id006
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: rspec
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -130,12 +145,12 @@ dependencies:
         - 0
         - 1
         version: 2.0.1
-  requirement: *id007
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: rspec-core
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -146,12 +161,12 @@ dependencies:
         - 0
         - 1
         version: 2.0.1
-  requirement: *id008
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: rspec-expectations
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -162,12 +177,12 @@ dependencies:
         - 0
         - 1
         version: 2.0.1
-  requirement: *id009
+  requirement: *id010
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: rspec-mocks
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -178,12 +193,12 @@ dependencies:
         - 0
         - 1
         version: 2.0.1
-  requirement: *id010
+  requirement: *id011
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: rcov
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -194,12 +209,12 @@ dependencies:
         - 9
         - 8
         version: 0.9.8
-  requirement: *id011
+  requirement: *id012
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: cucumber
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -210,12 +225,12 @@ dependencies:
         - 9
         - 4
         version: 0.9.4
-  requirement: *id012
+  requirement: *id013
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: will_paginate
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -226,12 +241,12 @@ dependencies:
         - 0
         - pre
         version: 3.0.pre
-  requirement: *id013
+  requirement: *id014
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: ginger
-  version_requirements: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -242,12 +257,12 @@ dependencies:
         - 2
         - 0
         version: 1.2.0
-  requirement: *id014
+  requirement: *id015
 - !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
   name: faker
-  version_requirements: &id015 !ruby/object:Gem::Requirement 
+  version_requirements: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -258,7 +273,7 @@ dependencies:
         - 3
         - 1
         version: 0.3.1
-  requirement: *id015
+  requirement: *id016
 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
 executables: []
@@ -274,11 +289,14 @@ files:
 - lib/cucumber/thinking_sphinx/external_world.rb
 - lib/cucumber/thinking_sphinx/internal_world.rb
 - lib/cucumber/thinking_sphinx/sql_logger.rb
+- lib/thinking-sphinx.rb
 - lib/thinking_sphinx.rb
+- lib/thinking_sphinx/action_controller.rb
 - lib/thinking_sphinx/active_record.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
+- lib/thinking_sphinx/active_record/log_subscriber.rb
 - lib/thinking_sphinx/active_record/scopes.rb
 - lib/thinking_sphinx/adapters/abstract_adapter.rb
 - lib/thinking_sphinx/adapters/mysql_adapter.rb