freelancing-god-thinking-sphinx 1.1.16 → 1.1.17

data/README.textile

@@ -127,3 +127,4 @@ Since I first released this library, there's been quite a few people who have su
 * Mike Bailey
 * Bill Leeper
 * Michael Reinsch
+* Anderson Dias

data/lib/thinking_sphinx.rb

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

data/lib/thinking_sphinx/adapters/postgresql_adapter.rb

@@ -11,7 +11,12 @@ module ThinkingSphinx
     
     def concatenate(clause, separator = ' ')
       clause.split(', ').collect { |field|
-        field[/COALESCE/] ? field : "COALESCE(CAST(#{field} as varchar), '')"
+        case field
+        when /COALESCE/, "'')"
+          field
+        else
+          "COALESCE(CAST(#{field} as varchar), '')"
+        end
       }.join(" || '#{separator}' || ")
     end
     

data/lib/thinking_sphinx/attribute.rb

@@ -89,13 +89,13 @@ module ThinkingSphinx
     def to_select_sql
       return nil unless include_as_association?
       
+      separator = all_ints? || @crc ? ',' : ' '
+      
       clause = @columns.collect { |column|
         part = column_with_prefix(column)
         type == :string ? adapter.convert_nulls(part) : part
       }.join(', ')
       
-      separator = all_ints? || @crc ? ',' : ' '
-      
       clause = adapter.cast_to_datetime(clause)             if type == :datetime
       clause = adapter.crc(clause)                          if @crc
       clause = adapter.concatenate(clause, separator)       if concat_ws?

data/lib/thinking_sphinx/configuration.rb

@@ -71,10 +71,19 @@ module ThinkingSphinx
       self.reset
     end
     
-    def reset
-      self.app_root          = RAILS_ROOT if defined?(RAILS_ROOT)
-      self.app_root          = Merb.root  if defined?(Merb)
-      self.app_root        ||= app_root
+    def self.configure(&block)
+      yield instance
+      instance.reset(instance.app_root)
+    end
+    
+    def reset(custom_app_root=nil)
+      if custom_app_root
+        self.app_root = custom_app_root
+      else
+        self.app_root          = RAILS_ROOT if defined?(RAILS_ROOT)
+        self.app_root          = Merb.root  if defined?(Merb)
+        self.app_root        ||= app_root
+      end
       
       @configuration = Riddle::Configuration.new
       @configuration.searchd.address    = "127.0.0.1"

data/lib/thinking_sphinx/search.rb

@@ -358,10 +358,8 @@ module ThinkingSphinx
         
         retry_search_on_stale_index(query, options) do
           results, client = search_results(*(query + [options]))
-        
-          ::ActiveRecord::Base.logger.error(
-            "Sphinx Error: #{results[:error]}"
-          ) if results[:error]
+          
+          log "Sphinx Error: #{results[:error]}", :error if results[:error]
         
           klass   = options[:class]
           page    = options[:page] ? options[:page].to_i : 1
@@ -394,9 +392,9 @@ module ThinkingSphinx
           options[:without_ids] = Array(options[:without_ids]) | e.ids  # Actual exclusion
 
           tries = stale_retries_left
-          ::ActiveRecord::Base.logger.debug("Sphinx Stale Ids (%s %s left): %s" % [
-              tries, (tries==1 ? 'try' : 'tries'), stale_ids.join(', ')
-          ])
+          log "Sphinx Stale Ids (%s %s left): %s" % [
+            tries, (tries==1 ? 'try' : 'tries'), stale_ids.join(', ')
+          ]
           
           retry
         end
@@ -465,9 +463,12 @@ module ThinkingSphinx
         client.offset = (page - 1) * client.limit
 
         begin
-          ::ActiveRecord::Base.logger.debug "Sphinx: #{query}"
+          log "Sphinx: #{query}"
           results = client.query query
-          ::ActiveRecord::Base.logger.debug "Sphinx Result: #{results[:matches].collect{|m| m[:attributes]["sphinx_internal_id"]}.inspect}"
+          log "Sphinx Result:"
+          log results[:matches].collect { |m|
+            m[:attributes]["sphinx_internal_id"]
+          }.inspect
         rescue Errno::ECONNREFUSED => err
           raise ThinkingSphinx::ConnectionError, "Connection to Sphinx Daemon (searchd) failed."
         end
@@ -706,6 +707,11 @@ module ThinkingSphinx
         
         string
       end
+      
+      def log(message, method = :debug)
+        return if ::ActiveRecord::Base.logger.nil?
+        ::ActiveRecord::Base.logger.send method, message
+      end
     end
   end
 end

data/lib/thinking_sphinx/search/facets.rb

@@ -22,7 +22,12 @@ module ThinkingSphinx
         hash    = ThinkingSphinx::FacetCollection.new args + [options]
         options = options.clone.merge! facet_query_options
         
-        klass.sphinx_facets.inject(hash) do |hash, facet|
+        facets  = klass.sphinx_facets
+        facets  = Array(options.delete(:facets)).collect { |name|
+          klass.sphinx_facets.detect { |facet| facet.name.to_s == name.to_s }
+        }.compact if options[:facets]
+        
+        facets.inject(hash) do |hash, facet|
           unless facet.name == :class && !options[:class_facet]
             options[:group_by]    = facet.attribute_name
             hash.add_from_results facet, search(*(args + [options]))

data/lib/thinking_sphinx/source.rb

@@ -102,8 +102,8 @@ module ThinkingSphinx
       
       source.sql_query_pre += send(!delta ? :sql_query_pre_for_core : :sql_query_pre_for_delta)
       
-      if @options[:group_concat_max_len]
-        source.sql_query_pre << "SET SESSION group_concat_max_len = #{@options[:group_concat_max_len]}"
+      if @index.local_options[:group_concat_max_len]
+        source.sql_query_pre << "SET SESSION group_concat_max_len = #{@index.local_options[:group_concat_max_len]}"
       end
       
       source.sql_query_pre += [adapter.utf8_query_pre].compact if utf8?

data/lib/thinking_sphinx/tasks.rb

@@ -26,9 +26,7 @@ namespace :thinking_sphinx do
     
     Dir["#{config.searchd_file_path}/*.spl"].each { |file| File.delete(file) }
 
-    cmd = "#{config.bin_path}searchd --pidfile --config #{config.config_file}"
-    puts cmd
-    system cmd
+    system! "#{config.bin_path}searchd --pidfile --config #{config.config_file}"
     
     sleep(2)
     
@@ -44,7 +42,7 @@ namespace :thinking_sphinx do
     raise RuntimeError, "searchd is not running." unless sphinx_running?
     config = ThinkingSphinx::Configuration.instance
     pid    = sphinx_pid
-    system "#{config.bin_path}searchd --stop --config #{config.config_file}"
+    system! "#{config.bin_path}searchd --stop --config #{config.config_file}"
     puts "Stopped search daemon (pid #{pid})."
   end
   
@@ -71,8 +69,15 @@ namespace :thinking_sphinx do
     FileUtils.mkdir_p config.searchd_file_path
     cmd = "#{config.bin_path}indexer --config #{config.config_file} --all"
     cmd << " --rotate" if sphinx_running?
-    puts cmd
-    system cmd
+    
+    system! cmd
+  end
+  
+  desc "Stop Sphinx (if it's running), rebuild the indexes, and start Sphinx"
+  task :rebuild => :app_env do
+    Rake::Task["thinking_sphinx:stop"].invoke if sphinx_running?
+    Rake::Task["thinking_sphinx:index"].invoke
+    Rake::Task["thinking_sphinx:start"].invoke
   end
   
   namespace :index do
@@ -122,6 +127,8 @@ namespace :ts do
   task :conf    => "thinking_sphinx:configure"
   desc "Generate the Sphinx configuration file using Thinking Sphinx's settings"
   task :config  => "thinking_sphinx:configure"
+  desc "Stop Sphinx (if it's running), rebuild the indexes, and start Sphinx"
+  task :rebuild => "thinking_sphinx:rebuild"
   desc "Process stored delta index requests"
   task :dd      => "thinking_sphinx:delayed_delta"
 end
@@ -133,3 +140,19 @@ 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/unit/thinking_sphinx/configuration_spec.rb

@@ -71,7 +71,16 @@ describe ThinkingSphinx::Configuration do
       FileUtils.rm "#{RAILS_ROOT}/config/sphinx.yml"
     end
   end
-    
+
+  describe "block configuration" do
+    it "should let the user set-up a custom app_root" do
+      ThinkingSphinx::Configuration.configure do |config|
+        config.app_root = "/here/somewhere"
+      end
+      ThinkingSphinx::Configuration.instance.app_root.should == "/here/somewhere"
+    end
+  end
+  
   describe "initialisation" do
     it "should have a default bin_path of nothing" do
       ThinkingSphinx::Configuration.instance.bin_path.should == ""

data/spec/unit/thinking_sphinx/index/builder_spec.rb

@@ -318,13 +318,17 @@ describe ThinkingSphinx::Index::Builder do
         indexes first_name
         
         set_property :charset_type => "utf16"
+        set_property :group_concat_max_len => 1024
       end
     end
     
-    it "should store the setting for the index" do
-      @index.local_options.length.should == 1
+    it "should store the index setting for the index" do
       @index.local_options[:charset_type].should == "utf16"
     end
+    
+    it "should store non-Sphinx settings for the index" do
+      @index.local_options[:group_concat_max_len].should == 1024
+    end
   end
   
   describe "delta options" do

data/spec/unit/thinking_sphinx/search_spec.rb

@@ -99,13 +99,13 @@ describe ThinkingSphinx::Search do
       @birthday_results.stub!(:each_with_groupby_and_count).
         and_yield(@person, @person.birthday.to_i, 1)
       
-      ThinkingSphinx::Search.stub!(:search).and_return(@city_results, @birthday_results)
-      
       @config = ThinkingSphinx::Configuration.instance
       @config.configuration.searchd.max_matches = 10_000
     end
     
     it "should use the system-set max_matches for limit on facet calls" do
+      ThinkingSphinx::Search.stub!(:search).and_return(@city_results, @birthday_results)
+      
       ThinkingSphinx::Search.should_receive(:search) do |options|
         options[:max_matches].should  == 10_000
         options[:limit].should        == 10_000
@@ -115,6 +115,8 @@ describe ThinkingSphinx::Search do
     end
     
     it "should use the default max-matches if there is no explicit setting" do
+      ThinkingSphinx::Search.stub!(:search).and_return(@city_results, @birthday_results)
+      
       @config.configuration.searchd.max_matches = nil
       ThinkingSphinx::Search.should_receive(:search) do |options|
         options[:max_matches].should  == 1000
@@ -125,6 +127,8 @@ describe ThinkingSphinx::Search do
     end
     
     it "should ignore user-provided max_matches and limit on facet calls" do
+      ThinkingSphinx::Search.stub!(:search).and_return(@city_results, @birthday_results)
+      
       ThinkingSphinx::Search.should_receive(:search) do |options|
         options[:max_matches].should  == 10_000
         options[:limit].should        == 10_000
@@ -137,6 +141,15 @@ describe ThinkingSphinx::Search do
       )
     end
     
+    it "should use explicit facet list if one is provided" do
+      ThinkingSphinx::Search.should_receive(:search).once.and_return(@city_results)
+      
+      ThinkingSphinx::Search.facets(
+        :facets => ['city'],
+        :class  => Person
+      )
+    end
+    
     describe "conflicting facets" do
       before :each do
         @index = ThinkingSphinx::Index::Builder.generate(Alpha) do

data/spec/unit/thinking_sphinx/source_spec.rb

@@ -41,6 +41,8 @@ describe ThinkingSphinx::Source do
       @source.conditions << "`birthday` <= NOW()"
       @source.groupings  << "`first_name`"
       
+      @index.local_options[:group_concat_max_len] = 1024
+      
       @riddle = @source.to_riddle_for_core(1, 0)
     end
     
@@ -148,8 +150,15 @@ describe ThinkingSphinx::Source do
       end
       
       it "should default to just the UTF8 statement" do
-        @queries.length.should == 1
-        @queries.first.should == "SET NAMES utf8"
+        @queries.detect { |query|
+          query == "SET NAMES utf8"
+        }.should_not be_nil
+      end
+      
+      it "should set the group_concat_max_len session value for MySQL if requested" do
+        @queries.detect { |query|
+          query == "SET SESSION group_concat_max_len = 1024"
+        }.should_not be_nil
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: freelancing-god-thinking-sphinx
 version: !ruby/object:Gem::Version 
-  version: 1.1.16
+  version: 1.1.17
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-23 00:00:00 -07:00
+date: 2009-05-24 00:00:00 -07:00
 default_executable: 
 dependencies: []