thinking-sphinx 1.3.8 → 1.3.9

data/README.textile

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

data/VERSION

@@ -1 +1 @@
-1.3.8
+1.3.9

data/lib/thinking_sphinx/active_record.rb

@@ -242,6 +242,33 @@ module ThinkingSphinx
           index eldest_indexed_ancestor
       end
       
+      # Temporarily disable delta indexing inside a block, then perform a single
+      # rebuild of index at the end.
+      #
+      # Useful when performing updates to batches of models to prevent
+      # the delta index being rebuilt after each individual update.
+      #
+      # In the following example, the delta index will only be rebuilt once,
+      # not 10 times.
+      #
+      #   SomeModel.suspended_delta do
+      #     10.times do
+      #       SomeModel.create( ... )
+      #     end
+      #   end
+      #
+      def suspended_delta(reindex_after = true, &block)
+        define_indexes
+        original_setting = ThinkingSphinx.deltas_enabled?
+        ThinkingSphinx.deltas_enabled = false
+        begin
+          yield
+        ensure
+          ThinkingSphinx.deltas_enabled = original_setting
+          self.index_delta if reindex_after
+        end
+      end
+      
       private
             
       def local_sphinx_indexes

data/lib/thinking_sphinx/active_record/attribute_updates.rb

@@ -37,7 +37,7 @@ module ThinkingSphinx
       
       def attribute_values_for_index(index)
         updatable_attributes(index).inject({}) { |hash, attrib|
-          if attrib.type == :datetime
+          if attrib.type == :datetime && attrib.live_value(self)
             hash[attrib.unique_name.to_s] = attrib.live_value(self).to_time.to_i
           else
             hash[attrib.unique_name.to_s] = attrib.live_value self

data/lib/thinking_sphinx/active_record/delta.rb

@@ -12,32 +12,6 @@ module ThinkingSphinx
       def self.included(base)
         base.class_eval do
           class << self
-            # Temporarily disable delta indexing inside a block, then perform a single
-            # rebuild of index at the end.
-            #
-            # Useful when performing updates to batches of models to prevent
-            # the delta index being rebuilt after each individual update.
-            #
-            # In the following example, the delta index will only be rebuilt once,
-            # not 10 times.
-            #
-            #   SomeModel.suspended_delta do
-            #     10.times do
-            #       SomeModel.create( ... )
-            #     end
-            #   end
-            #
-            def suspended_delta(reindex_after = true, &block)
-              original_setting = ThinkingSphinx.deltas_enabled?
-              ThinkingSphinx.deltas_enabled = false
-              begin
-                yield
-              ensure
-                ThinkingSphinx.deltas_enabled = original_setting
-                self.index_delta if reindex_after
-              end
-            end
-
             # Build the delta index for the related model. This won't be called
             # if running in the test environment.
             #

data/lib/thinking_sphinx/index.rb

@@ -138,7 +138,8 @@ module ThinkingSphinx
     
     def set_configuration_options_for_indexes(index)
       config.index_options.each do |key, value|
-        index.send("#{key}=".to_sym, value)
+        method = "#{key}=".to_sym
+        index.send(method, value) if index.respond_to?(method)
       end
       
       options.each do |key, value|

data/lib/thinking_sphinx/search.rb

@@ -93,8 +93,7 @@ module ThinkingSphinx
         add_scope(method, *args, &block)
         return self
       elsif method == :search_count
-        @options[:ids_only] = true
-        return self.total_entries
+        return scoped_count
       elsif method.to_s[/^each_with_.*/].nil? && !@array.respond_to?(method)
         super
       elsif !SafeMethods.include?(method.to_s)
@@ -151,7 +150,9 @@ module ThinkingSphinx
     # @return [Integer]
     # 
     def per_page
-      @options[:limit] || @options[:per_page] || 20
+      @options[:limit] ||= @options[:per_page]
+      @options[:limit] ||= 20
+      @options[:limit].to_i
     end
     
     # The total number of pages available if the results are paginated.
@@ -179,11 +180,12 @@ module ThinkingSphinx
     end
     
     # The current page's offset, based on the number of records per page.
+    # Or explicit :offset if given. 
     # 
     # @return [Integer]
     # 
     def offset
-      (current_page - 1) * per_page
+      @options[:offset] || ((current_page - 1) * per_page)
     end
     
     def indexes
@@ -729,5 +731,16 @@ MSG
         end
       end
     end
+    
+    def scoped_count
+      return self.total_entries if @options[:ids_only]
+      
+      @options[:ids_only] = true
+      results_count = self.total_entries
+      @options[:ids_only] = false
+      @populated = false
+      
+      results_count
+    end
   end
 end

data/lib/thinking_sphinx/tasks.rb

@@ -29,10 +29,8 @@ namespace :thinking_sphinx do
     raise RuntimeError, "searchd is already running." if sphinx_running?
     
     Dir["#{config.searchd_file_path}/*.spl"].each { |file| File.delete(file) }
-
-    system! "#{config.bin_path}#{config.searchd_binary_name} --pidfile --config \"#{config.config_file}\""
     
-    sleep(2)
+    config.controller.start
     
     if sphinx_running?
       puts "Started successfully (pid #{sphinx_pid})."
@@ -48,7 +46,7 @@ namespace :thinking_sphinx do
     else
       config = ThinkingSphinx::Configuration.instance
       pid    = sphinx_pid
-      system! "#{config.bin_path}#{config.searchd_binary_name} --stop --config \"#{config.config_file}\""
+      config.controller.stop
       puts "Stopped search daemon (pid #{pid})."
     end
   end
@@ -72,10 +70,14 @@ namespace :thinking_sphinx do
     end
     
     FileUtils.mkdir_p config.searchd_file_path
-    cmd = "#{config.bin_path}#{config.indexer_binary_name} --config \"#{config.config_file}\" --all"
-    cmd << " --rotate" if sphinx_running?
-    
-    system! cmd
+    puts config.controller.index
+  end
+  
+  desc "Reindex Sphinx without regenerating the configuration file"
+  task :reindex => :app_env do
+    config = ThinkingSphinx::Configuration.instance
+    FileUtils.mkdir_p config.searchd_file_path
+    puts config.controller.index
   end
   
   desc "Stop Sphinx (if it's running), rebuild the indexes, and start Sphinx"
@@ -98,6 +100,8 @@ namespace :ts do
   desc "Index data for Sphinx using Thinking Sphinx's settings"
   task :in      => "thinking_sphinx:index"
   task :index   => "thinking_sphinx:index"
+  desc "Reindex Sphinx without regenerating the configuration file"
+  task :reindex => "thinking_sphinx:reindex"
   desc "Restart Sphinx"
   task :restart => "thinking_sphinx:restart"
   desc "Generate the Sphinx configuration file using Thinking Sphinx's settings"
@@ -115,19 +119,3 @@ end
 def sphinx_running?
   ThinkingSphinx.sphinx_running?
 end
-
-# a fail-fast, hopefully helpful version of system
-def system!(cmd)
-  unless system(cmd)
-    raise <<-SYSTEM_CALL_FAILED
-The following command failed:
-  #{cmd}
-
-This could be caused by a PATH issue in the environment of cron/passenger/etc. Your current PATH:
-  #{ENV['PATH']}
-You can set the path to your indexer and searchd binaries using the bin_path property in config/sphinx.yml:
-  production:
-    bin_path: '/usr/local/bin'
-SYSTEM_CALL_FAILED
-  end
-end

data/spec/thinking_sphinx/active_record/scopes_spec.rb

@@ -146,6 +146,7 @@ describe ThinkingSphinx::ActiveRecord::Scopes do
       @config.stub!(:client => @client)
       @client.stub!(:query => {:matches => [], :total_found => 43})
       Alpha.sphinx_scope(:by_name) { |name| {:conditions => {:name => name}} }
+      Alpha.sphinx_scope(:ids_only) { {:ids_only => true} }
     end
     
     it "should return the total number of results" do
@@ -157,6 +158,20 @@ describe ThinkingSphinx::ActiveRecord::Scopes do
       
       Alpha.by_name('foo').search_count
     end
+    
+    it "should not leave the :ids_only option set and the results populated if it was not set before" do
+      stored_scope = Alpha.by_name('foo')
+      stored_scope.search_count
+      stored_scope.options[:ids_only].should be_false
+      stored_scope.populated?.should be_false
+    end
+    
+    it "should leave the :ids_only option set and the results populated if it was set before" do
+      stored_scope = Alpha.by_name('foo').ids_only
+      stored_scope.search_count
+      stored_scope.options[:ids_only].should be_true
+      stored_scope.populated?.should be_true
+    end
   end
   
 end

data/spec/thinking_sphinx/index_spec.rb

@@ -132,12 +132,18 @@ describe ThinkingSphinx::Index do
     end
     
     context 'core index' do
-      before :each 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 use the core name" do
-        @index.name.should == 'alpha_core'
+      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
     

data/spec/thinking_sphinx/search_spec.rb

@@ -833,6 +833,10 @@ describe ThinkingSphinx::Search do
         :per_page => 30, :limit => 40
       ).per_page.should == 40
     end
+    
+    it "should allow for string arguments" do
+      ThinkingSphinx::Search.new(:per_page => '10').per_page.should == 10
+    end
   end
   
   describe '#total_pages' do
@@ -903,6 +907,10 @@ describe ThinkingSphinx::Search do
     it "should increase by the per_page value for each page in" do
       ThinkingSphinx::Search.new(:per_page => 25, :page => 2).offset.should == 25
     end
+
+    it "should prioritise explicit :offset over calculated if given" do
+      ThinkingSphinx::Search.new(:offset => 5).offset.should == 5
+    end
   end
   
   describe '#indexes' do

data/spec/thinking_sphinx_spec.rb

@@ -7,8 +7,12 @@ describe ThinkingSphinx do
     end
     
     it "should remember changes to the Context instance" do
+      models = ThinkingSphinx.context.indexed_models
+      
       ThinkingSphinx.context.indexed_models.replace([:model])
       ThinkingSphinx.context.indexed_models.should == [:model]
+      
+      ThinkingSphinx.context.indexed_models.replace(models)
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thinking-sphinx
 version: !ruby/object:Gem::Version 
-  version: 1.3.8
+  version: 1.3.9
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-02 00:00:00 +11:00
+date: 2009-12-09 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency