@@ -2,9 +2,9 @@ require 'thinking_sphinx' require 'action_controller/dispatcher' if Rails::VERSION::STRING.to_f < 2.1 - ThinkingSphinx::Configuration.new.load_models + ThinkingSphinx::Configuration.instance.load_models end ActionController::Dispatcher.to_prepare :thinking_sphinx do - ThinkingSphinx::Configuration.new.load_models + ThinkingSphinx::Configuration.instance.load_models end \ No newline at end of file init.rb @@ -127,7 +127,7 @@ module ThinkingSphinx def toggle_deleted return unless ThinkingSphinx.updates_enabled? - config = ThinkingSphinx::Configuration.new + config = ThinkingSphinx::Configuration.instance client = Riddle::Client.new config.address, config.port client.update( lib/thinking_sphinx/active_record.rb @@ -44,10 +44,10 @@ module ThinkingSphinx def index_delta(instance = nil) return true unless ThinkingSphinx.updates_enabled? && ThinkingSphinx.deltas_enabled? - - config = ThinkingSphinx::Configuration.new + + config = ThinkingSphinx::Configuration.instance client = Riddle::Client.new config.address, config.port - + client.update( "#{self.sphinx_indexes.first.name}_core", ['sphinx_deleted'], lib/thinking_sphinx/active_record/delta.rb @@ -1,4 +1,5 @@ require 'erb' +require 'singleton' module ThinkingSphinx # This class both keeps track of the configuration settings for Sphinx and @@ -41,11 +42,28 @@ module ThinkingSphinx # don't set allow_star to true. # class Configuration + include Singleton + + SourceOptions = %w( mysql_connect_flags sql_range_step sql_query_pre + sql_query_post sql_ranged_throttle sql_query_post_index ) + + IndexOptions = %w( charset_table charset_type docinfo enable_star + exceptions html_index_attrs html_remove_elements html_strip ignore_chars + min_infix_len min_prefix_len min_word_len mlock morphology ngram_chars + ngram_len phrase_boundary phrase_boundary_step preopen stopwords + wordforms ) + + IndexerOptions = %w( max_iops max_iosize mem_limit ) + + SearchdOptions = %w( read_timeout max_children max_matches seamless_rotate + preopen_indexes unlink_old ) + attr_accessor :config_file, :searchd_log_file, :query_log_file, - :pid_file, :searchd_file_path, :address, :port, :enable_star, - :allow_star, :min_prefix_len, :min_infix_len, :mem_limit, :max_matches, - :morphology, :charset_type, :charset_table, :ignore_chars, :html_strip, - :html_remove_elements, :database_yml_file, :app_root, :bin_path + :pid_file, :searchd_file_path, :address, :port, :allow_star, + :database_yml_file, :app_root, :bin_path + + attr_accessor :source_options, :index_options, :indexer_options, + :searchd_options attr_reader :environment @@ -53,6 +71,10 @@ module ThinkingSphinx # and parse it according to the current environment. # def initialize(app_root = Dir.pwd) + 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 @@ -66,22 +88,27 @@ module ThinkingSphinx self.address = "127.0.0.1" self.port = 3312 self.allow_star = false - self.enable_star = false - self.min_prefix_len = nil - self.min_infix_len = nil - self.mem_limit = "64M" - self.max_matches = 1000 - self.morphology = "stem_en" - self.charset_type = "utf-8" - self.charset_table = nil - self.ignore_chars = nil - self.html_strip = false - self.html_remove_elements = "" + # self.enable_star = false + # self.min_prefix_len = nil + # self.min_infix_len = nil + # self.mem_limit = "64M" + # self.max_matches = 1000 + # self.morphology = "stem_en" + # self.charset_type = "utf-8" + # self.charset_table = nil + # self.ignore_chars = nil + # self.html_strip = false + # self.html_remove_elements = "" self.bin_path = "" + self.source_options = {} + self.index_options = {} + self.indexer_options = {} + self.searchd_options = {} + parse_config - self.bin_path += '/' unless self.bin_path.blank? + self end def self.environment @@ -110,7 +137,7 @@ module ThinkingSphinx file.write <<-CONFIG indexer { - mem_limit = #{self.mem_limit} +#{hash_to_config(self.indexer_options)} } searchd @@ -119,10 +146,8 @@ searchd port = #{self.port} log = #{self.searchd_log_file} query_log = #{self.query_log_file} - read_timeout = 5 - max_children = 30 pid_file = #{self.pid_file} - max_matches = #{self.max_matches} +#{hash_to_config(self.searchd_options)} } CONFIG @@ -134,7 +159,7 @@ searchd infixed_fields = [] model.sphinx_indexes.select { |index| index.model == model }.each_with_index do |index, i| - file.write index.to_config(model, i, database_conf, charset_type, model_index) + file.write index.to_config(model, i, database_conf, model_index) index.adapter_object.setup @@ -181,6 +206,31 @@ searchd end end + def hash_to_config(hash) + hash.collect { |key, value| + translated_value = case value + when TrueClass + "1" + when FalseClass + "0" + when NilClass, "" + next + else + value + end + " #{key} = #{translated_value}" + }.join("\n") + end + + def self.options_merge(base, extra) + base = base.clone + extra.each do |key, value| + next if value.nil? || value == "" + base[key] = value + end + base + end + private # Parse the config/sphinx.yml file - if it exists - then use the attribute @@ -194,7 +244,14 @@ searchd conf.each do |key,value| self.send("#{key}=", value) if self.methods.include?("#{key}=") + + self.source_options[key.to_sym] = value if SourceOptions.include?(key.to_s) + self.index_options[key.to_sym] = value if IndexOptions.include?(key.to_s) + self.indexer_options[key.to_sym] = value if IndexerOptions.include?(key.to_s) + self.searchd_options[key.to_sym] = value if SearchdOptions.include?(key.to_s) end unless conf.nil? + + self.bin_path += '/' unless self.bin_path.blank? end def core_index_for_model(model, sources) @@ -204,31 +261,18 @@ index #{ThinkingSphinx::Index.name(model)}_core { #{sources} path = #{self.searchd_file_path}/#{ThinkingSphinx::Index.name(model)}_core -charset_type = #{self.charset_type} INDEX - morphology = model.sphinx_indexes.inject(self.morphology) { |morph, index| - index.options[:morphology] || morph - } - output += " morphology = #{morphology}\n" unless morphology.blank? - output += " charset_table = #{self.charset_table}\n" unless self.charset_table.nil? - output += " ignore_chars = #{self.ignore_chars}\n" unless self.ignore_chars.nil? + unless combined_index_options(model).empty? + output += hash_to_config(combined_index_options(model)) + end if self.allow_star # Ye Olde way of turning on enable_star output += " enable_star = 1\n" - output += " min_prefix_len = #{self.min_prefix_len}\n" - else - # New, better way of turning on enable_star - thanks to James Healy - output += " enable_star = 1\n" if self.enable_star - output += " min_prefix_len = #{self.min_prefix_len}\n" unless self.min_prefix_len.nil? - output += " min_infix_len = #{self.min_infix_len}\n" unless self.min_infix_len.nil? + output += " min_prefix_len = #{self.combined_index_options[:min_prefix_len]}\n" end - - output += " html_strip = 1\n" if self.html_strip - output += " html_remove_elements = #{self.html_remove_elements}\n" unless self.html_remove_elements.blank? - unless model.sphinx_indexes.collect(&:prefix_fields).flatten.empty? output += " prefix_fields = #{model.sphinx_indexes.collect(&:prefix_fields).flatten.map(&:unique_name).join(', ')}\n" else @@ -265,41 +309,14 @@ index #{ThinkingSphinx::Index.name(model)} { type = distributed #{ sources.join("\n ") } - charset_type = #{self.charset_type} } INDEX end - def create_array_accum - ::ActiveRecord::Base.connection.execute "begin" - ::ActiveRecord::Base.connection.execute "savepoint ts" - begin - # see http://www.postgresql.org/docs/8.2/interactive/sql-createaggregate.html - if ::ActiveRecord::Base.connection.raw_connection.server_version > 80200 - ::ActiveRecord::Base.connection.execute <<-SQL - CREATE AGGREGATE array_accum (anyelement) - ( - sfunc = array_append, - stype = anyarray, - initcond = '{}' - ); - SQL - else - ::ActiveRecord::Base.connection.execute <<-SQL - CREATE AGGREGATE array_accum - ( - basetype = anyelement, - sfunc = array_append, - stype = anyarray, - initcond = '{}' - ); - SQL - end - rescue - ::ActiveRecord::Base.connection.execute "rollback to savepoint ts" + def combined_index_options(model) + model.sphinx_indexes.inject(self.index_options) do |options, index| + self.class.options_merge(options, index.local_index_options) end - ::ActiveRecord::Base.connection.execute "release savepoint ts" - ::ActiveRecord::Base.connection.execute "commit" end end end lib/thinking_sphinx/configuration.rb @@ -48,11 +48,11 @@ module ThinkingSphinx end def empty?(part = :core) - config = ThinkingSphinx::Configuration.new + config = ThinkingSphinx::Configuration.instance File.size?("#{config.searchd_file_path}/#{self.name}_#{part}.spa").nil? end - def to_config(model, index, database_conf, charset_type, offset) + def to_config(model, index, database_conf, offset) # Set up associations and joins add_internal_attributes link! @@ -82,13 +82,14 @@ sql_db = #{database_conf[:database]} #{"sql_port = #{database_conf[:port]}" unless database_conf[:port].blank? } #{"sql_sock = #{database_conf[:socket]}" unless database_conf[:socket].blank? } -sql_query_pre = #{charset_type == "utf-8" && adapter == :mysql ? "SET NAMES utf8" : ""} +sql_query_pre = #{utf8? && adapter == :mysql ? "SET NAMES utf8" : ""} #{"sql_query_pre = SET SESSION group_concat_max_len = #{@options[:group_concat_max_len]}" if @options[:group_concat_max_len]} sql_query_pre = #{to_sql_query_pre} sql_query = #{to_sql(:offset => offset).gsub(/\n/, ' ')} sql_query_range = #{to_sql_query_range} sql_query_info = #{to_sql_query_info(offset)} #{attr_sources} +#{ThinkingSphinx::Configuration.instance.hash_to_config(self.source_options)} } SOURCE @@ -98,7 +99,7 @@ sql_query_info = #{to_sql_query_info(offset)} source #{self.class.name(model)}_#{index}_delta : #{self.class.name(model)}_#{index}_core { sql_query_pre = -sql_query_pre = #{charset_type == "utf-8" && adapter == :mysql ? "SET NAMES utf8" : ""} +sql_query_pre = #{utf8? && adapter == :mysql ? "SET NAMES utf8" : ""} #{"sql_query_pre = SET SESSION group_concat_max_len = #{@options[:group_concat_max_len]}" if @options[:group_concat_max_len]} sql_query = #{to_sql(:delta => true, :offset => offset).gsub(/\n/, ' ')} sql_query_range = #{to_sql_query_range :delta => true} @@ -257,8 +258,37 @@ GROUP BY #{ ( @fields.select { |field| field.infixes } end + def local_index_options + @options.keys.inject({}) do |local_options, key| + if ThinkingSphinx::Configuration::IndexOptions.include?(key.to_s) + local_options[key.to_sym] = @options[key] + local_options + end + end + end + + def index_options + all_index_options = ThinkingSphinx::Configuration.instance.index_options.clone + @options.keys.select { |key| + ThinkingSphinx::Configuration::IndexOptions.include?(key.to_s) + }.each { |key| all_index_options[key.to_sym] = @options[key] } + all_index_options + end + + def source_options + all_source_options = ThinkingSphinx::Configuration.instance.source_options.clone + @options.keys.select { |key| + ThinkingSphinx::Configuration::SourceOptions.include?(key.to_s) + }.each { |key| all_source_options[key.to_sym] = @options[key] } + all_source_options + end + private + def utf8? + self.index_options[:charset_type] == "utf-8" + end + def quote_column(column) @model.connection.quote_column_name(column) end lib/thinking_sphinx/index.rb @@ -270,7 +270,7 @@ module ThinkingSphinx # options hash. # def client_from_options(options = {}) - config = ThinkingSphinx::Configuration.new + config = ThinkingSphinx::Configuration.instance client = Riddle::Client.new config.address, config.port klass = options[:class] index_options = klass ? klass.sphinx_indexes.last.options : {} lib/thinking_sphinx/search.rb @@ -32,6 +32,20 @@ Spec::Runner.configure do |config| ThinkingSphinx.updates_enabled = true ThinkingSphinx.deltas_enabled = true + + ThinkingSphinx::Configuration.instance.reset + ThinkingSphinx::Configuration.instance.database_yml_file = "spec/fixtures/sphinx/database.yml" + + # Ensure after_commit plugin is loaded correctly + Object.subclasses_of(ActiveRecord::ConnectionAdapters::AbstractAdapter).each { |klass| + unless klass.ancestors.include?(AfterCommit::ConnectionAdapters) + klass.send(:include, AfterCommit::ConnectionAdapters) + end + } + end + + config.before :each do + # end config.after :each do spec/spec_helper.rb @@ -49,7 +49,7 @@ class SphinxHelper end def setup_sphinx - @configuration = ThinkingSphinx::Configuration.new + @configuration = ThinkingSphinx::Configuration.instance.reset File.open("spec/fixtures/sphinx/database.yml", "w") do |file| YAML.dump({@configuration.environment => { :adapter => 'mysql', spec/sphinx_helper.rb @@ -1,10 +1,5 @@ require 'spec/spec_helper' -# Ensure after_commit plugin is loaded correctly -Object.subclasses_of(ActiveRecord::ConnectionAdapters::AbstractAdapter).each { |klass| - klass.send(:include, AfterCommit::ConnectionAdapters) -} - describe "ThinkingSphinx::ActiveRecord::Delta" do it "should call the toggle_delta method after a save" do @beta = Beta.new @@ -78,7 +73,7 @@ describe "ThinkingSphinx::ActiveRecord::Delta" do @person.send(:index_delta) Person.should have_received(:system).with( - "#{ThinkingSphinx::Configuration.new.bin_path}indexer --config #{ThinkingSphinx::Configuration.new.config_file} --rotate person_delta" + "#{ThinkingSphinx::Configuration.instance.bin_path}indexer --config #{ThinkingSphinx::Configuration.instance.config_file} --rotate person_delta" ) end spec/unit/thinking_sphinx/active_record/delta_spec.rb @@ -121,14 +121,14 @@ describe "ThinkingSphinx::ActiveRecord" do describe "toggle_deleted method" do before :each do - @configuration = ThinkingSphinx::Configuration.stub_instance( + @configuration = ThinkingSphinx::Configuration.instance + @configuration.stub_methods( :address => "an address", :port => 123 ) @client = Riddle::Client.stub_instance(:update => true) @person = Person.find(:first) - ThinkingSphinx::Configuration.stub_method(:new => @configuration) Riddle::Client.stub_method(:new => @client) Person.sphinx_indexes.each { |index| index.stub_method(:delta? => false) } @person.stub_method(:in_core_index? => true) @@ -271,7 +271,7 @@ describe "ThinkingSphinx::ActiveRecord" do end it "should remove destroyed new instances from the delta index if they're in it" do - beta = Beta.create(:name => "eleven") + beta = Beta.create!(:name => "eleven") sleep(1) # wait for Sphinx to catch up Beta.search("eleven").should_not be_empty spec/unit/thinking_sphinx/active_record_spec.rb @@ -33,14 +33,14 @@ describe ThinkingSphinx::Configuration do describe "environment instance method" do it "should return the class method" do ThinkingSphinx::Configuration.stub_method(:environment => "spec") - ThinkingSphinx::Configuration.new.environment.should == "spec" + ThinkingSphinx::Configuration.instance.environment.should == "spec" ThinkingSphinx::Configuration.should have_received(:environment) end end describe "build method" do before :each do - @config = ThinkingSphinx::Configuration.new + @config = ThinkingSphinx::Configuration.instance @config.stub_methods( :load_models => "", @@ -102,13 +102,6 @@ describe ThinkingSphinx::Configuration do YAML.should have_received(:load) end - it "should set the mem limit based on the configuration" do - @config.build - - file = open(@config.config_file) { |f| f.read } - file.should match(/mem_limit\s+= #{@config.mem_limit}/) - end - it "should use the configuration port" do @config.build @@ -131,24 +124,17 @@ describe ThinkingSphinx::Configuration do file.should match(/pid_file\s+= #{@config.pid_file}/) end - it "should set max matches from configuration" do - @config.build - - file = open(@config.config_file) { |f| f.read } - file.should match(/max_matches\s+= #{@config.max_matches}/) - end - it "should request configuration for each index for each model" do @config.build @person_index_a.should have_received(:to_config).with( - Person, 0, {:option => "value"}, @config.charset_type, 0 + Person, 0, {:option => "value"}, 0 ) @person_index_b.should have_received(:to_config).with( - Person, 1, {:option => "value"}, @config.charset_type, 0 + Person, 1, {:option => "value"}, 0 ) @friendship_index_a.should have_received(:to_config).with( - Friendship, 0, {:option => "value"}, @config.charset_type, 1 + Friendship, 0, {:option => "value"}, 1 ) end @@ -202,7 +188,6 @@ describe ThinkingSphinx::Configuration do "searchd_file_path" => "searchd/file/path", "address" => "127.0.0.1", "port" => 3333, - "allow_star" => true, "min_prefix_len" => 2, "min_infix_len" => 3, "mem_limit" => "128M", @@ -220,9 +205,12 @@ describe ThinkingSphinx::Configuration do end it "should use the accessors to set the configuration values" do - config = ThinkingSphinx::Configuration.new - @settings["development"].each do |key, value| - config.send(key).should == value + config = ThinkingSphinx::Configuration.instance + config.send(:parse_config) + + %w(config_file searchd_log_file query_log_file pid_file searchd_file_path + address port).each do |key| + config.send(key).should == @settings["development"][key] end end @@ -233,7 +221,7 @@ describe ThinkingSphinx::Configuration do describe "core_index_for_model method" do before :each do - @config = ThinkingSphinx::Configuration.new + @config = ThinkingSphinx::Configuration.instance @model = Person end @@ -251,88 +239,59 @@ describe ThinkingSphinx::Configuration do end it "should include the charset type setting" do - @config.charset_type = "specchars" + @config.index_options[:charset_type] = "specchars" @config.send(:core_index_for_model, @model, "my sources").should match( /charset_type = specchars/ ) end it "should include the morphology setting if it isn't blank" do - @config.morphology = "morph" + @config.index_options[:morphology] = "morph" @config.send(:core_index_for_model, @model, "my sources").should match( /morphology\s+= morph/ ) end it "should not include the morphology setting if it is blank" do - @config.morphology = nil + @config.index_options[:morphology] = nil @config.send(:core_index_for_model, @model, "my sources").should_not match( /morphology\s+=/ ) - @config.morphology = "" + @config.index_options[:morphology] = "" @config.send(:core_index_for_model, @model, "my sources").should_not match( /morphology\s+=/ ) end it "should include the charset_table value if it isn't nil" do - @config.charset_table = "table_chars" + @config.index_options[:charset_table] = "table_chars" @config.send(:core_index_for_model, @model, "my sources").should match( /charset_table\s+= table_chars/ ) end it "should not set the charset_table value if it is nil" do - @config.charset_table = nil + @config.index_options[:charset_table] = nil @config.send(:core_index_for_model, @model, "my sources").should_not match( /charset_table\s+=/ ) end it "should set the ignore_chars value if it isn't nil" do - @config.ignore_chars = "ignorable" + @config.index_options[:ignore_chars] = "ignorable" @config.send(:core_index_for_model, @model, "my sources").should match( /ignore_chars\s+= ignorable/ ) end it "should not set the ignore_chars value if it is nil" do - @config.ignore_chars = nil + @config.index_options[:ignore_chars] = nil @config.send(:core_index_for_model, @model, "my sources").should_not match( /ignore_chars\s+=/ ) end - it "should include the star-related settings when allow_star is true" do - @config.allow_star = true - @config.min_prefix_len = 1 - text = @config.send(:core_index_for_model, @model, "my sources") - - text.should match(/enable_star\s+= 1/) - text.should match(/min_prefix_len\s+= 1/) - # text.should match(/min_infix_len\s+= 1/) - end - - it "should use the configuration's infix and prefix length values if set" do - @config.allow_star = true - @config.min_prefix_len = 3 - @config.min_infix_len = 2 - text = @config.send(:core_index_for_model, @model, "my sources") - - text.should match(/min_prefix_len\s+= 3/) - # text.should match(/min_infix_len\s+= 2/) - end - - it "should not include the star-related settings when allow_star is false" do - @config.allow_star = false - text = @config.send(:core_index_for_model, @model, "my sources") - - text.should_not match(/enable_star\s+=/) - text.should_not match(/min_prefix_len\s+=/) - text.should_not match(/min_infix_len\s+=/) - end - it "should set prefix_fields if any fields are flagged explicitly" do @model.sphinx_indexes.first.stub_methods( :prefix_fields => [ @@ -384,23 +343,25 @@ describe ThinkingSphinx::Configuration do end it "should include html_strip if value is set" do - @config.html_strip = 1 + @config.index_options[:html_strip] = 1 text = @config.send(:core_index_for_model, @model, "my sources") text.should match(/html_strip\s+= 1/) end it "shouldn't include html_strip if value is not set" do + @config.index_options.delete :html_strip text = @config.send(:core_index_for_model, @model, "my sources") text.should_not match(/html_strip/) end it "should include html_remove_elements if values are set" do - @config.html_remove_elements = 'script' + @config.index_options[:html_remove_elements] = 'script' text = @config.send(:core_index_for_model, @model, "my sources") text.should match(/html_remove_elements\s+= script/) end it "shouldn't include html_remove_elements if no values are set" do + @config.index_options.delete :html_remove_elements text = @config.send(:core_index_for_model, @model, "my sources") text.should_not match(/html_remove_elements/) end @@ -408,7 +369,7 @@ describe ThinkingSphinx::Configuration do describe "delta_index_for_model method" do before :each do - @config = ThinkingSphinx::Configuration.new + @config = ThinkingSphinx::Configuration.instance @model = Person end @@ -434,7 +395,7 @@ describe ThinkingSphinx::Configuration do describe "distributed_index_for_model method" do before :each do - @config = ThinkingSphinx::Configuration.new + @config = ThinkingSphinx::Configuration.instance @model = Person end @@ -478,7 +439,7 @@ describe ThinkingSphinx::Configuration do describe "initialisation" do it "should have a default bin_path of nothing" do - ThinkingSphinx::Configuration.new.bin_path.should == "" + ThinkingSphinx::Configuration.instance.bin_path.should == "" end it "should append a / to bin_path if one is supplied" do @@ -492,7 +453,60 @@ describe ThinkingSphinx::Configuration do f.write YAML.dump(@settings) end - ThinkingSphinx::Configuration.new.bin_path.should match(/\/$/) + ThinkingSphinx::Configuration.instance.send(:parse_config) + ThinkingSphinx::Configuration.instance.bin_path.should match(/\/$/) + end + end + + it "should insert set searchd options into the configuration file" do + config = ThinkingSphinx::Configuration.instance + ThinkingSphinx::Configuration::SearchdOptions.each do |option| + config.searchd_options[option.to_sym] = "something" + config.build + + file = open(config.config_file) { |f| f.read } + file.should match(/#{option}\s+= something/) + + config.searchd_options[option.to_sym] = nil + end + end + + it "should insert set indexer options into the configuration file" do + config = ThinkingSphinx::Configuration.instance + ThinkingSphinx::Configuration::IndexerOptions.each do |option| + config.indexer_options[option.to_sym] = "something" + config.build + + file = open(config.config_file) { |f| f.read } + file.should match(/#{option}\s+= something/) + + config.indexer_options[option.to_sym] = nil + end + end + + it "should insert set index options into the configuration file" do + config = ThinkingSphinx::Configuration.instance + ThinkingSphinx::Configuration::IndexOptions.each do |option| + config.index_options[option.to_sym] = "something" + config.build + + file = open(config.config_file) { |f| f.read } + file.should match(/#{option}\s+= something/) + + config.index_options[option.to_sym] = nil + end + end + + it "should insert set source options into the configuration file" do + config = ThinkingSphinx::Configuration.instance + ThinkingSphinx::Configuration::SourceOptions.each do |option| + config.source_options[option.to_sym] = "something" + config.build + + file = open(config.config_file) { |f| f.read } + file.should match(/#{option}\s+= something/) + + config.source_options[option.to_sym] = nil end end end \ No newline at end of file spec/unit/thinking_sphinx/configuration_spec.rb @@ -28,7 +28,7 @@ describe ThinkingSphinx::Index do end it "should call link!" do - @index.to_config(Person, 0, @database, "utf-8", 0) + @index.to_config(Person, 0, @database, 0) @index.should have_received(:link!) end @@ -36,17 +36,17 @@ describe ThinkingSphinx::Index do it "should raise an exception if the adapter isn't mysql or postgres" do @index.stub_method(:adapter => :sqlite) - lambda { @index.to_config(Person, 0, @database, "utf-8", 0) }.should raise_error + lambda { @index.to_config(Person, 0, @database, 0) }.should raise_error end it "should set the core source name to {model}_{index}_core" do - @index.to_config(Person, 0, @database, "utf-8", 0).should match( + @index.to_config(Person, 0, @database, 0).should match( /source person_0_core/ ) end it "should include the database config supplied" do - conf = @index.to_config(Person, 0, @database, "utf-8", 0) + conf = @index.to_config(Person, 0, @database, 0) conf.should match(/type\s+= mysql/) conf.should match(/sql_host\s+= localhost/) conf.should match(/sql_user\s+= username/) @@ -57,96 +57,99 @@ describe ThinkingSphinx::Index do it "should use 'user' if 'username' doesn't exist in database configuration" do conf = @index.to_config(Person, 0, @database.except(:username).merge(:user => "username"), - "utf-8", 0 + 0 ) conf.should match(/sql_user\s+= username/) end it "should include the database socket if set" do - conf = @index.to_config(Person, 0, @database.merge(:socket => "dbsocket"), "utf-8", 0) + conf = @index.to_config(Person, 0, @database.merge(:socket => "dbsocket"), 0) conf.should match(/sql_sock\s+= dbsocket/) end it "should not include the database socket if not set" do - conf = @index.to_config(Person, 0, @database, "utf-8", 0) + conf = @index.to_config(Person, 0, @database, 0) conf.should_not match(/sql_sock/) end it "should include the database port if set" do - conf = @index.to_config(Person, 0, @database.merge(:port => "dbport"), "utf-8", 0) + conf = @index.to_config(Person, 0, @database.merge(:port => "dbport"), 0) conf.should match(/sql_port\s+= dbport/) end it "should not include the database socket if not set" do - conf = @index.to_config(Person, 0, @database, "utf-8", 0) + conf = @index.to_config(Person, 0, @database, 0) conf.should_not match(/sql_port/) end it "should have a pre query 'SET NAMES utf8' if using mysql and utf8 charset" do - @index.to_config(Person, 0, @database, "utf-8", 0).should match( + @index.options[:charset_type] = "utf-8" + @index.to_config(Person, 0, @database, 0).should match( /sql_query_pre\s+= SET NAMES utf8/ ) @index.stub_method(:delta? => true) - @index.to_config(Person, 0, @database, "utf-8", 0).should match( + @index.to_config(Person, 0, @database, 0).should match( /source person_0_delta.+sql_query_pre\s+= SET NAMES utf8/m ) + @index.options[:charset_type] = "non-utf-8" @index.stub_method(:delta? => false) - @index.to_config(Person, 0, @database, "non-utf-8", 0).should_not match( + @index.to_config(Person, 0, @database, 0).should_not match( /SET NAMES utf8/ ) + @index.options[:charset_type] = "utf-8" @index.stub_method(:adapter => :postgres) - @index.to_config(Person, 0, @database, "utf-8", 0).should_not match( + @index.to_config(Person, 0, @database, 0).should_not match( /SET NAMES utf8/ ) end it "should use the pre query from the index" do - @index.to_config(Person, 0, @database, "utf-8", 0).should match( + @index.to_config(Person, 0, @database, 0).should match( /sql_query_pre\s+= sql_query_pre/ ) end it "should not set group_concat_max_len if not specified" do - @index.to_config(Person, 0, @database, "utf-8", 0).should_not match( + @index.to_config(Person, 0, @database, 0).should_not match( /group_concat_max_len/ ) end it "should set group_concat_max_len if specified" do @index.options.merge! :group_concat_max_len => 2056 - @index.to_config(Person, 0, @database, "utf-8", 0).should match( + @index.to_config(Person, 0, @database, 0).should match( /sql_query_pre\s+= SET SESSION group_concat_max_len = 2056/ ) @index.stub_method(:delta? => true) - @index.to_config(Person, 0, @database, "utf-8", 0).should match( + @index.to_config(Person, 0, @database, 0).should match( /source person_0_delta.+sql_query_pre\s+= SET SESSION group_concat_max_len = 2056/m ) end it "should use the main query from the index" do - @index.to_config(Person, 0, @database, "utf-8", 0).should match( + @index.to_config(Person, 0, @database, 0).should match( /sql_query\s+= SQL/ ) end it "should use the range query from the index" do - @index.to_config(Person, 0, @database, "utf-8", 0).should match( + @index.to_config(Person, 0, @database, 0).should match( /sql_query_range\s+= sql_query_range/ ) end it "should use the info query from the index" do - @index.to_config(Person, 0, @database, "utf-8", 0).should match( + @index.to_config(Person, 0, @database, 0).should match( /sql_query_info\s+= sql_query_info/ ) end it "should include the attribute sources" do - @index.to_config(Person, 0, @database, "utf-8", 0).should match( + @index.to_config(Person, 0, @database, 0).should match( /attr a\n\s+attr b/ ) end @@ -154,13 +157,13 @@ describe ThinkingSphinx::Index do it "should add a delta index with name {model}_{index}_delta if requested" do @index.stub_method(:delta? => true) - @index.to_config(Person, 0, @database, "utf-8", 0).should match( + @index.to_config(Person, 0, @database, 0).should match( /source person_0_delta/ ) end it "should not add a delta index unless requested" do - @index.to_config(Person, 0, @database, "utf-8", 0).should_not match( + @index.to_config(Person, 0, @database, 0).should_not match( /source person_0_delta/ ) end @@ -168,7 +171,7 @@ describe ThinkingSphinx::Index do it "should have the delta index inherit from the core index" do @index.stub_method(:delta? => true) - @index.to_config(Person, 0, @database, "utf-8", 0).should match( + @index.to_config(Person, 0, @database, 0).should match( /source person_0_delta : person_0_core/ ) end @@ -176,7 +179,7 @@ describe ThinkingSphinx::Index do it "should redefine the main query for the delta index" do @index.stub_method(:delta? => true) - @index.to_config(Person, 0, @database, "utf-8", 0).should match( + @index.to_config(Person, 0, @database, 0).should match( /source person_0_delta.+sql_query\s+= SQL/m ) end @@ -184,7 +187,7 @@ describe ThinkingSphinx::Index do it "should redefine the range query for the delta index" do @index.stub_method(:delta? => true) - @index.to_config(Person, 0, @database, "utf-8", 0).should match( + @index.to_config(Person, 0, @database, 0).should match( /source person_0_delta.+sql_query_range\s+= sql_query_range/m ) end @@ -192,7 +195,7 @@ describe ThinkingSphinx::Index do it "should redefine the pre query for the delta index" do @index.stub_method(:delta? => true) - @index.to_config(Person, 0, @database, "utf-8", 0).should match( + @index.to_config(Person, 0, @database, 0).should match( /source person_0_delta.+sql_query_pre\s+=\s*\n/m ) end @@ -268,7 +271,7 @@ describe ThinkingSphinx::Index do describe "empty? method" do before :each do @index = ThinkingSphinx::Index.new(Contact) - config = ThinkingSphinx::Configuration.new + config = ThinkingSphinx::Configuration.instance `mkdir -p #{config.searchd_file_path}` @file_path = "#{config.searchd_file_path}/#{@index.name}_core.spa" spec/unit/thinking_sphinx/index_spec.rb @@ -14,7 +14,7 @@ namespace :thinking_sphinx do desc "Start a Sphinx searchd daemon using Thinking Sphinx's settings" task :start => :app_env do - config = ThinkingSphinx::Configuration.new + config = ThinkingSphinx::Configuration.instance FileUtils.mkdir_p config.searchd_file_path raise RuntimeError, "searchd is already running." if sphinx_running? @@ -47,14 +47,14 @@ namespace :thinking_sphinx do desc "Generate the Sphinx configuration file using Thinking Sphinx's settings" task :configure => :app_env do - config = ThinkingSphinx::Configuration.new + config = ThinkingSphinx::Configuration.instance puts "Generating Configuration to #{config.config_file}" config.build end desc "Index data for Sphinx using Thinking Sphinx's settings" task :index => :app_env do - config = ThinkingSphinx::Configuration.new + config = ThinkingSphinx::Configuration.instance unless ENV["INDEX_ONLY"] == "true" puts "Generating Configuration to #{config.config_file}" config.build @@ -86,7 +86,7 @@ namespace :ts do end def sphinx_pid - config = ThinkingSphinx::Configuration.new + config = ThinkingSphinx::Configuration.instance if File.exists?(config.pid_file) `cat #{config.pid_file}`[/\d+/] tasks/thinking_sphinx_tasks.rb 832bc78a5668b603abe340a8ede50c8e25a13cb1 Pat Allan pat@freelancing-gods.com http://github.com/jaikoo/thinking-sphinx/commit/ec5b0e5cc71ee46bd79c5eb597086a3c1ce8040b ec5b0e5cc71ee46bd79c5eb597086a3c1ce8040b 2008-10-18T06:10:16-07:00 2008-10-18T06:10:16-07:00 Restructuring Configuration to be a singleton and providing support for all Sphinx config options 014b43c80263f5c2ba1f7268f96f268080884424 Pat Allan pat@freelancing-gods.com