thinking-sphinx 1.3.7 → 1.3.8

data/README.textile

@@ -156,3 +156,4 @@ Since I first released this library, there's been quite a few people who have su
 * Chris Roos
 * Andrew Assarattanakul
 * Jonas von Andrian
+* Dimitri Krassovski

data/VERSION

@@ -1 +1 @@
-1.3.7
+1.3.8

data/features/sphinx_scopes.feature

@@ -33,3 +33,10 @@ Feature: Sphinx Scopes
     And I am searching on people
     When I use the ids_only scope
     Then I should have an array of integers
+  
+  Scenario: Counts with scopes
+    Given Sphinx is running
+    And I am searching on people
+    When I use the with_first_name scope set to "Andrew"
+    And I am retrieving the scoped result count
+    Then I should get a value of 7

data/features/step_definitions/scope_steps.rb

@@ -9,3 +9,7 @@ end
 When /^I use the ([\w]+) scope set to (\d+)$/ do |scope, int|
   @results = results.send(scope.to_sym, int.to_i)
 end
+
+When /^I am retrieving the scoped result count$/ do
+  @results = results.search_count
+end

data/features/support/env.rb

@@ -16,7 +16,6 @@ require 'cucumber/thinking_sphinx/internal_world'
 world = Cucumber::ThinkingSphinx::InternalWorld.new
 world.configure_database
 
-SphinxVersion = ENV['VERSION'] || '0.9.8'
-require "thinking_sphinx/#{SphinxVersion}"
+require "thinking_sphinx"
 
 world.setup

data/lib/thinking_sphinx.rb

@@ -2,7 +2,9 @@ require 'active_record'
 require 'after_commit'
 require 'yaml'
 require 'cgi'
+require 'riddle'
 
+require 'thinking_sphinx/auto_version'
 require 'thinking_sphinx/core/array'
 require 'thinking_sphinx/core/string'
 require 'thinking_sphinx/property'
@@ -221,3 +223,5 @@ module ThinkingSphinx
   
   extend ThinkingSphinx::SearchMethods::ClassMethods
 end
+
+ThinkingSphinx::AutoVersion.detect

data/lib/thinking_sphinx/active_record.rb

@@ -177,6 +177,12 @@ module ThinkingSphinx
         subclasses.each { |klass| klass.add_sphinx_index(index) }
       end
       
+      def has_sphinx_indexes?
+        sphinx_indexes      && 
+        sphinx_index_blocks &&
+        (sphinx_indexes.length > 0 || sphinx_index_blocks.length > 0)
+      end
+      
       def indexed_by_sphinx?
         sphinx_indexes && sphinx_indexes.length > 0
       end

data/lib/thinking_sphinx/auto_version.rb

@@ -0,0 +1,22 @@
+module ThinkingSphinx
+  class AutoVersion
+    def self.detect
+      version = ThinkingSphinx::Configuration.instance.controller.sphinx_version
+      case version
+      when '0.9.8', '0.9.9'
+        require "riddle/#{version}"
+      else
+        STDERR.puts %Q{
+Sphinx cannot be found on your system. You may need to configure the following
+settings in your config/sphinx.yml file:
+  * bin_path
+  * searchd_binary_name
+  * indexer_binary_name
+
+For more information, read the documentation:
+http://freelancing-god.github.com/ts/en/advanced_config.html
+}
+      end
+    end
+  end
+end

data/lib/thinking_sphinx/configuration.rb

@@ -64,14 +64,12 @@ module ThinkingSphinx
     
     CustomOptions = %w( disable_range )
         
-    attr_accessor :config_file, :searchd_log_file, :query_log_file,
-      :pid_file, :searchd_file_path, :address, :port, :allow_star,
-      :database_yml_file, :app_root, :bin_path, :model_directories,
-      :delayed_job_priority, :searchd_binary_name, :indexer_binary_name
+    attr_accessor :searchd_file_path, :allow_star, :database_yml_file,
+      :app_root, :model_directories, :delayed_job_priority
     
     attr_accessor :source_options, :index_options
     
-    attr_reader :environment, :configuration
+    attr_reader :environment, :configuration, :controller
     
     # Load in the configuration settings - this will look for config/sphinx.yml
     # and parse it according to the current environment.
@@ -101,11 +99,12 @@ module ThinkingSphinx
       @configuration.searchd.log        = "#{self.app_root}/log/searchd.log"
       @configuration.searchd.query_log  = "#{self.app_root}/log/searchd.query.log"
       
+      @controller = Riddle::Controller.new @configuration,
+        "#{self.app_root}/config/#{environment}.sphinx.conf"
+      
       self.database_yml_file    = "#{self.app_root}/config/database.yml"
-      self.config_file          = "#{self.app_root}/config/#{environment}.sphinx.conf"
       self.searchd_file_path    = "#{self.app_root}/db/sphinx/#{environment}"
       self.allow_star           = false
-      self.bin_path             = ""
       self.model_directories    = ["#{app_root}/app/models/"] +
         Dir.glob("#{app_root}/vendor/plugins/*/app/models/")
       self.delayed_job_priority = 0
@@ -115,9 +114,6 @@ module ThinkingSphinx
         :charset_type => "utf-8"
       }
       
-      self.searchd_binary_name = "searchd"
-      self.indexer_binary_name = "indexer"
-            
       parse_config
       
       self
@@ -133,10 +129,6 @@ module ThinkingSphinx
       self.class.environment
     end
     
-    def controller
-      @controller ||= Riddle::Controller.new(@configuration, self.config_file)
-    end
-    
     # Generate the config file for Sphinx by using all the settings defined and
     # looping through all the models with indexes to build the relevant
     # indexer and searchd configuration, and sources and indexes details.
@@ -197,6 +189,38 @@ module ThinkingSphinx
       @configuration.searchd.query_log = file
     end
     
+    def config_file
+      @controller.path
+    end
+    
+    def config_file=(file)
+      @controller.path = file
+    end
+    
+    def bin_path
+      @controller.bin_path
+    end
+    
+    def bin_path=(path)
+      @controller.bin_path = path
+    end
+    
+    def searchd_binary_name
+      @controller.searchd_binary_name
+    end
+    
+    def searchd_binary_name=(name)
+      @controller.searchd_binary_name = name
+    end
+    
+    def indexer_binary_name
+      @controller.indexer_binary_name
+    end
+    
+    def indexer_binary_name=(name)
+      @controller.indexer_binary_name = name
+    end
+    
     def client
       client = Riddle::Client.new address, port
       client.max_matches = configuration.searchd.max_matches || 1000

data/lib/thinking_sphinx/context.rb

@@ -7,6 +7,7 @@ class ThinkingSphinx::Context
   
   def prepare
     load_models
+    add_indexed_models if cached?
   end
   
   def define_indexes
@@ -32,15 +33,23 @@ class ThinkingSphinx::Context
   
   private
   
+  def cached?
+    defined?(Rails)                   &&
+    Rails::VERSION::STRING.to_f > 2.1 &&
+    Rails.configuration.cache_classes
+  end
+  
+  def add_indexed_models
+    Object.subclasses_of(ActiveRecord::Base).each do |klass|
+      add_indexed_model klass if klass.has_sphinx_indexes?
+    end
+  end
+  
   # Make sure all models are loaded - without reloading any that
   # ActiveRecord::Base is already aware of (otherwise we start to hit some
   # messy dependencies issues).
   #
   def load_models
-    return if defined?(Rails) &&
-      Rails::VERSION::STRING.to_f > 2.1 &&
-      Rails.configuration.cache_classes
-    
     ThinkingSphinx::Configuration.instance.model_directories.each do |base|
       Dir["#{base}**/*.rb"].each do |file|
         model_name = file.gsub(/^#{base}([\w_\/\\]+)\.rb/, '\1')

data/lib/thinking_sphinx/search.rb

@@ -92,6 +92,9 @@ module ThinkingSphinx
       if is_scope?(method)
         add_scope(method, *args, &block)
         return self
+      elsif method == :search_count
+        @options[:ids_only] = true
+        return self.total_entries
       elsif method.to_s[/^each_with_.*/].nil? && !@array.respond_to?(method)
         super
       elsif !SafeMethods.include?(method.to_s)

data/rails/init.rb

@@ -2,7 +2,7 @@ Dir[File.join(File.dirname(__FILE__), '../vendor/*/lib')].each do |path|
   $LOAD_PATH.unshift path
 end
 
-require 'thinking_sphinx/0.9.8'
+require 'thinking_sphinx'
 require 'action_controller/dispatcher'
 
 ActionController::Dispatcher.to_prepare :thinking_sphinx do

data/spec/thinking_sphinx/active_record/scopes_spec.rb

@@ -137,4 +137,26 @@ describe ThinkingSphinx::ActiveRecord::Scopes do
       search.with_betas.options[:classes].should == [Alpha, Beta]
     end
   end
+  
+  describe '.search_count_with_scope' do
+    before :each do
+      @config = ThinkingSphinx::Configuration.instance
+      @client = Riddle::Client.new
+
+      @config.stub!(:client => @client)
+      @client.stub!(:query => {:matches => [], :total_found => 43})
+      Alpha.sphinx_scope(:by_name) { |name| {:conditions => {:name => name}} }
+    end
+    
+    it "should return the total number of results" do
+      Alpha.by_name('foo').search_count.should == 43
+    end
+    
+    it "should not make any calls to the database" do
+      Alpha.should_not_receive(:find)
+      
+      Alpha.by_name('foo').search_count
+    end
+  end
+  
 end

data/spec/thinking_sphinx/active_record_spec.rb

@@ -16,6 +16,9 @@ describe ThinkingSphinx::ActiveRecord do
     Alpha.sphinx_indexes.replace @existing_alpha_indexes
     Beta.sphinx_indexes.replace  @existing_beta_indexes
     
+    Alpha.send :defined_indexes=, true
+    Beta.send  :defined_indexes=, true
+    
     Alpha.sphinx_index_blocks.clear
     Beta.sphinx_index_blocks.clear
   end
@@ -585,4 +588,27 @@ describe ThinkingSphinx::ActiveRecord do
       Parent.sphinx_offset.should == 1
     end
   end
+  
+  describe '.has_sphinx_indexes?' do
+    it "should return true if there are sphinx indexes defined" do
+      Alpha.sphinx_indexes.replace [stub('index')]
+      Alpha.sphinx_index_blocks.replace []
+      
+      Alpha.should have_sphinx_indexes
+    end
+    
+    it "should return true if there are sphinx index blocks defined" do
+      Alpha.sphinx_indexes.replace []
+      Alpha.sphinx_index_blocks.replace [stub('lambda')]
+      
+      Alpha.should have_sphinx_indexes
+    end
+    
+    it "should return false if there are no sphinx indexes or blocks" do
+      Alpha.sphinx_indexes.clear
+      Alpha.sphinx_index_blocks.clear
+      
+      Alpha.should_not have_sphinx_indexes
+    end
+  end
 end

data/spec/thinking_sphinx/auto_version_spec.rb

@@ -0,0 +1,39 @@
+require 'spec/spec_helper'
+
+describe ThinkingSphinx::AutoVersion do
+  describe '.detect' do
+    before :each do
+      @controller = ThinkingSphinx::Configuration.instance.controller
+    end
+    
+    it "should require 0.9.8 if that is the detected version" do
+      ThinkingSphinx::AutoVersion.should_receive(:require).
+        with('riddle/0.9.8')
+      
+      @controller.stub!(:sphinx_version => '0.9.8')
+      ThinkingSphinx::AutoVersion.detect
+    end
+    
+    it "should require 0.9.9 if that is the detected version" do
+      ThinkingSphinx::AutoVersion.should_receive(:require).
+        with('riddle/0.9.9')
+      
+      @controller.stub!(:sphinx_version => '0.9.9')
+      ThinkingSphinx::AutoVersion.detect
+    end
+    
+    it "should output a warning if the detected version is something else" do
+      STDERR.should_receive(:puts)
+      
+      @controller.stub!(:sphinx_version => '0.9.7')
+      ThinkingSphinx::AutoVersion.detect
+    end
+    
+    it "should output a warning if the version cannot be determined" do
+      STDERR.should_receive(:puts)
+      
+      @controller.stub!(:sphinx_version => nil)
+      ThinkingSphinx::AutoVersion.detect
+    end
+  end
+end

data/tasks/distribution.rb

@@ -28,7 +28,7 @@ Jeweler::Tasks.new do |gem|
   ]
   
   gem.add_dependency 'activerecord', '>= 1.15.6'
-  gem.add_dependency 'riddle',       '>= 1.0.2'
+  gem.add_dependency 'riddle',       '>= 1.0.6'
   gem.add_dependency 'after_commit', '>= 1.0.5'
   
   gem.post_install_message = <<-MESSAGE

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thinking-sphinx
 version: !ruby/object:Gem::Version 
-  version: 1.3.7
+  version: 1.3.8
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-29 00:00:00 +11:00
+date: 2009-12-02 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.2
+        version: 1.0.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: after_commit
@@ -58,8 +58,6 @@ files:
 - lib/cucumber/thinking_sphinx/internal_world.rb
 - lib/cucumber/thinking_sphinx/sql_logger.rb
 - lib/thinking_sphinx.rb
-- lib/thinking_sphinx/0.9.8.rb
-- lib/thinking_sphinx/0.9.9.rb
 - lib/thinking_sphinx/active_record.rb
 - lib/thinking_sphinx/active_record/attribute_updates.rb
 - lib/thinking_sphinx/active_record/delta.rb
@@ -70,6 +68,7 @@ files:
 - lib/thinking_sphinx/adapters/postgresql_adapter.rb
 - lib/thinking_sphinx/association.rb
 - lib/thinking_sphinx/attribute.rb
+- lib/thinking_sphinx/auto_version.rb
 - lib/thinking_sphinx/class_facet.rb
 - lib/thinking_sphinx/configuration.rb
 - lib/thinking_sphinx/context.rb
@@ -218,6 +217,7 @@ test_files:
 - spec/thinking_sphinx/active_record_spec.rb
 - spec/thinking_sphinx/association_spec.rb
 - spec/thinking_sphinx/attribute_spec.rb
+- spec/thinking_sphinx/auto_version_spec.rb
 - spec/thinking_sphinx/configuration_spec.rb
 - spec/thinking_sphinx/context_spec.rb
 - spec/thinking_sphinx/core/array_spec.rb

data/lib/thinking_sphinx/0.9.8.rb

@@ -1,3 +0,0 @@
-require 'riddle'
-require 'riddle/0.9.8'
-require 'thinking_sphinx'

data/lib/thinking_sphinx/0.9.9.rb

@@ -1,3 +0,0 @@
-require 'riddle'
-require 'riddle/0.9.9'
-require 'thinking_sphinx'